From f179ad9417fae2697e741db545498dad0ab63ad5 Mon Sep 17 00:00:00 2001 From: Jiri Srain Date: Mon, 30 Jan 2006 08:48:05 +0000 Subject: [PATCH] propagate installOnly() to zypp::Package interface, us it in target --- zypp/Package.cc | 3 +++ zypp/Package.h | 2 ++ zypp/detail/PackageImplIf.cc | 2 ++ zypp/detail/PackageImplIf.h | 2 ++ zypp/target/TargetImpl.cc | 3 ++- 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/zypp/Package.cc b/zypp/Package.cc index cfcf5e2..d98349e 100644 --- a/zypp/Package.cc +++ b/zypp/Package.cc @@ -173,6 +173,9 @@ namespace zypp return source().provideFile(plainRpm()); // never reached } + bool Package::installOnly() const + { return pimpl().installOnly(); } + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// diff --git a/zypp/Package.h b/zypp/Package.h index 50c01dc..a6a5be6 100644 --- a/zypp/Package.h +++ b/zypp/Package.h @@ -94,6 +94,8 @@ namespace zypp * \throws Exception */ Pathname getPatchRpm(BaseVersion & base_r) const; + /** */ + bool installOnly() const; // data here: diff --git a/zypp/detail/PackageImplIf.cc b/zypp/detail/PackageImplIf.cc index 61664d6..07d0598 100644 --- a/zypp/detail/PackageImplIf.cc +++ b/zypp/detail/PackageImplIf.cc @@ -95,6 +95,8 @@ namespace zypp std::list PackageImplIf::patchRpms() const { return std::list(); } + bool PackageImplIf::installOnly() const + { return false; } ///////////////////////////////////////////////////////////////// } // namespace detail diff --git a/zypp/detail/PackageImplIf.h b/zypp/detail/PackageImplIf.h index f9e481c..8dd1fa6 100644 --- a/zypp/detail/PackageImplIf.h +++ b/zypp/detail/PackageImplIf.h @@ -108,6 +108,8 @@ namespace zypp virtual std::list deltaRpms() const PURE_VIRTUAL; /** */ virtual std::list patchRpms() const PURE_VIRTUAL; + /** */ + virtual bool installOnly() const PURE_VIRTUAL; //@} diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc index e482dc4..8abc830 100644 --- a/zypp/target/TargetImpl.cc +++ b/zypp/target/TargetImpl.cc @@ -122,7 +122,8 @@ namespace zypp if (isKind(it->resolvable())) { Package::constPtr p = dynamic_pointer_cast(it->resolvable()); - rpm().installPackage(p->getPlainRpm(), rpm::RpmDb::RPMINST_NOUPGRADE); + rpm().installPackage(p->getPlainRpm(), + p->installOnly() ? rpm::RpmDb::RPMINST_NOUPGRADE : 0); } } } -- 2.7.4