October 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <zypper> master : Fix 'dup --from' not to perform a complete distupgrade. (bnc #549490)
by Michael Andres 23 Oct '09

23 Oct '09

ref: refs/heads/master commit 64c615be6f1d01954c2430f437b1b86f45167a53 Author: Michael Andres <ma(a)suse.de> Date: Fri Oct 23 15:02:04 2009 +0200 Fix 'dup --from' not to perform a complete distupgrade. (bnc #549490) --- src/solve-commit.cc | 30 ++++++++++++++++++++---------- 1 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/solve-commit.cc b/src/solve-commit.cc index f069021..e4f2920 100755 --- a/src/solve-commit.cc +++ b/src/solve-commit.cc @@ -326,7 +326,9 @@ static bool dist_upgrade(Zypper & zypper) dump_pool(); set_solver_flags(zypper); - // set repositories to upgrade to (--from) + // Test for repositories to upgrade to (--from) + // If those are specified addUpgradeRepo and solve, + // otherwise perform a full dist upgrade. list<RepoInfo> specified; list<string> not_found; @@ -338,18 +340,26 @@ static bool dist_upgrade(Zypper & zypper) if (!not_found.empty()) throw ExitRequestException("Some of specified repositories were not found."); - set<string> aliases; - for_(it, specified.begin(), specified.end()) - aliases.insert(it->alias()); - - for_(it, God->pool().knownRepositoriesBegin(), God->pool().knownRepositoriesEnd()) - if (aliases.find(it->alias()) != aliases.end()) + if ( ! specified.empty() ) + { + // Here: do upgrade for the specified repos: + Resolver_Ptr resolver( God->resolver() ); + ResPool pool ( God->pool() ); + for_( it, specified.begin(), specified.end() ) { - MIL << "Adding upgrade repository: " << it->alias() << endl; - God->resolver()->addUpgradeRepo(*it); + Repository repo( pool.reposFind( it->alias() ) ); + MIL << "Adding upgrade repository: " << repo.alias() << endl; + resolver->addUpgradeRepo( repo ); } - // compute the upgrade + DBG << "Calling the solver..." << endl; + //! \todo Somehow tell set_solver_flags/set_ignore_recommends_of_installed that + //! this is no full upgrade. Until then set setIgnoreAlreadyRecommended again here: + resolver->setIgnoreAlreadyRecommended( true ); + return resolver->resolvePool(); + } + + // Here: compute the full upgrade zypper.out().info(_("Computing upgrade..."), Out::HIGH); DBG << "Calling the solver doUpgrade()..." << endl; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : fix doc
by Michael Andres 23 Oct '09

23 Oct '09

ref: refs/heads/master commit 236dff7bd83d6d19f0786fc3976db4a842cac62f Author: Michael Andres <ma(a)suse.de> Date: Fri Oct 23 13:06:51 2009 +0200 fix doc --- zypp/media/MediaAccess.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zypp/media/MediaAccess.h b/zypp/media/MediaAccess.h index 2befca3..4245c71 100644 --- a/zypp/media/MediaAccess.h +++ b/zypp/media/MediaAccess.h @@ -105,7 +105,7 @@ namespace zypp { */ bool downloads() const; - /** \deprecated Use \ref Url::downloads */ + /** \deprecated Use \ref Url::schemeIsDownloading */ static ZYPP_DEPRECATED bool downloads(const Url &url) { return url.schemeIsDownloading(); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : fix doc
by Michael Andres 23 Oct '09

23 Oct '09

ref: refs/heads/ma-misc commit 236dff7bd83d6d19f0786fc3976db4a842cac62f Author: Michael Andres <ma(a)suse.de> Date: Fri Oct 23 13:06:51 2009 +0200 fix doc --- zypp/media/MediaAccess.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zypp/media/MediaAccess.h b/zypp/media/MediaAccess.h index 2befca3..4245c71 100644 --- a/zypp/media/MediaAccess.h +++ b/zypp/media/MediaAccess.h @@ -105,7 +105,7 @@ namespace zypp { */ bool downloads() const; - /** \deprecated Use \ref Url::downloads */ + /** \deprecated Use \ref Url::schemeIsDownloading */ static ZYPP_DEPRECATED bool downloads(const Url &url) { return url.schemeIsDownloading(); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : changes
by Ján Kupec 23 Oct '09

23 Oct '09

ref: refs/heads/master commit c91fb100e0e9937ed7056c01af094b1de584625a Author: Ján Kupec <jkupec(a)suse.cz> Date: Fri Oct 23 12:51:04 2009 +0200 changes --- VERSION.cmake | 2 +- package/zypper.changes | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 4de11b7..1d158f3 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "2") -SET(VERSION_PATCH "6") +SET(VERSION_PATCH "7") # LAST RELEASED: 1.2.6 #======= diff --git a/package/zypper.changes b/package/zypper.changes index f00b146..b35dba7 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 23 12:50:35 CEST 2009 - jkupec(a)suse.cz + +- Fixed unintentional hiding of the 'p' install summary option + (bnc #549183) + +------------------------------------------------------------------- Wed Oct 21 17:49:07 CEST 2009 - ma(a)suse.de - Fix abort on 'zypper lu -a'. (bnc #548752) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> master : Fixed unintentional hiding of the 'p' install summary option (bnc #549183)
by Ján Kupec 23 Oct '09

23 Oct '09

ref: refs/heads/master commit 550ddef99094d3f6d49993c2e833f7ee49b08b71 Author: Ján Kupec <jkupec(a)suse.cz> Date: Fri Oct 23 12:49:23 2009 +0200 Fixed unintentional hiding of the 'p' install summary option (bnc #549183) --- src/solve-commit.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/solve-commit.cc b/src/solve-commit.cc index 3c9a08b..f069021 100755 --- a/src/solve-commit.cc +++ b/src/solve-commit.cc @@ -551,7 +551,7 @@ void solve_and_commit (Zypper & zypper) // string will do. //! \todo add c for changelog and x for explain (show the dep tree) popts.setOptions(_("y/n/p/v/a/r/m/d/g"), 0); - popts.setShownCount(2); + popts.setShownCount(3); if (!(zypper.runtimeData().force_resolution && show_p_option)) popts.disable(2); // translators: help text for 'y' option in the 'Continue?' prompt -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : Enhance UpgradeRepo interface.
by Michael Andres 23 Oct '09

23 Oct '09

ref: refs/heads/master commit e3f13297ffa7ed3bc905b4bdabf65f511d9aca58 Author: Michael Andres <ma(a)suse.de> Date: Fri Oct 23 12:20:18 2009 +0200 Enhance UpgradeRepo interface. --- zypp/Resolver.cc | 1 + zypp/Resolver.h | 14 +++++++++++++- zypp/solver/detail/Resolver.h | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc index 6e3b9cf..db9ff6c 100644 --- a/zypp/Resolver.cc +++ b/zypp/Resolver.cc @@ -99,6 +99,7 @@ namespace zypp bool Resolver::solveSrcPackages() const { return _pimpl->solveSrcPackages(); } void Resolver::addUpgradeRepo( Repository repo_r ) { _pimpl->addUpgradeRepo( repo_r ); } + bool Resolver::upgradingRepo( Repository repo_r ) const { return _pimpl->upgradingRepo( repo_r ); } void Resolver::removeUpgradeRepo( Repository repo_r ) { _pimpl->removeUpgradeRepo( repo_r ); } void Resolver::removeUpgradeRepos() { _pimpl->removeUpgradeRepos(); } diff --git a/zypp/Resolver.h b/zypp/Resolver.h index b6b748b..74db641 100644 --- a/zypp/Resolver.h +++ b/zypp/Resolver.h @@ -218,15 +218,26 @@ namespace zypp void setDefaultSolveSrcPackages(); bool solveSrcPackages() const; + /** \name Upgrade to content of a specific repository. + * \note This is an ordinary solver request. You should simply + * \ref resolvePool to execute, and not \ref doUpgrade. + */ + //@{ /** * Adding request to perform a dist upgrade restricted to this repository. + * * This is what e.g. <tt>zypper dup --repo myrepo</tt> should perform. * \see \ref doUpgrade */ void addUpgradeRepo( Repository repo_r ); /** - * Remove the upgrade request for this repo. + * Whether there is an \c UpgradeRepo request pending for this repo. + */ + bool upgradingRepo( Repository repo_r ) const; + + /** + * Remove an upgrade request for this repo. */ void removeUpgradeRepo( Repository repo_r ); @@ -234,6 +245,7 @@ namespace zypp * Remove all upgrade repo requests. */ void removeUpgradeRepos(); + //@} /** * Adding additional requirement diff --git a/zypp/solver/detail/Resolver.h b/zypp/solver/detail/Resolver.h index 8f65722..ee4ee7b 100644 --- a/zypp/solver/detail/Resolver.h +++ b/zypp/solver/detail/Resolver.h @@ -154,7 +154,8 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable { ResPool pool() const; void setPool( const ResPool & pool ) { _pool = pool; } - void addUpgradeRepo( Repository repo_r ) { if ( repo_r ) _upgradeRepos.insert( repo_r ); } + void addUpgradeRepo( Repository repo_r ) { if ( repo_r && ! repo_r.isSystemRepo() ) _upgradeRepos.insert( repo_r ); } + bool upgradingRepo( Repository repo_r ) const { return( _upgradeRepos.find( repo_r ) != _upgradeRepos.end() ); } void removeUpgradeRepo( Repository repo_r ) { _upgradeRepos.erase( repo_r ); } void removeUpgradeRepos() { _upgradeRepos.clear(); } const std::set<Repository> & upgradeRepos() const { return _upgradeRepos; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> ma-misc : Enhance UpgradeRepo interface.
by Michael Andres 23 Oct '09

23 Oct '09

ref: refs/heads/ma-misc commit e3f13297ffa7ed3bc905b4bdabf65f511d9aca58 Author: Michael Andres <ma(a)suse.de> Date: Fri Oct 23 12:20:18 2009 +0200 Enhance UpgradeRepo interface. --- zypp/Resolver.cc | 1 + zypp/Resolver.h | 14 +++++++++++++- zypp/solver/detail/Resolver.h | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc index 6e3b9cf..db9ff6c 100644 --- a/zypp/Resolver.cc +++ b/zypp/Resolver.cc @@ -99,6 +99,7 @@ namespace zypp bool Resolver::solveSrcPackages() const { return _pimpl->solveSrcPackages(); } void Resolver::addUpgradeRepo( Repository repo_r ) { _pimpl->addUpgradeRepo( repo_r ); } + bool Resolver::upgradingRepo( Repository repo_r ) const { return _pimpl->upgradingRepo( repo_r ); } void Resolver::removeUpgradeRepo( Repository repo_r ) { _pimpl->removeUpgradeRepo( repo_r ); } void Resolver::removeUpgradeRepos() { _pimpl->removeUpgradeRepos(); } diff --git a/zypp/Resolver.h b/zypp/Resolver.h index b6b748b..74db641 100644 --- a/zypp/Resolver.h +++ b/zypp/Resolver.h @@ -218,15 +218,26 @@ namespace zypp void setDefaultSolveSrcPackages(); bool solveSrcPackages() const; + /** \name Upgrade to content of a specific repository. + * \note This is an ordinary solver request. You should simply + * \ref resolvePool to execute, and not \ref doUpgrade. + */ + //@{ /** * Adding request to perform a dist upgrade restricted to this repository. + * * This is what e.g. <tt>zypper dup --repo myrepo</tt> should perform. * \see \ref doUpgrade */ void addUpgradeRepo( Repository repo_r ); /** - * Remove the upgrade request for this repo. + * Whether there is an \c UpgradeRepo request pending for this repo. + */ + bool upgradingRepo( Repository repo_r ) const; + + /** + * Remove an upgrade request for this repo. */ void removeUpgradeRepo( Repository repo_r ); @@ -234,6 +245,7 @@ namespace zypp * Remove all upgrade repo requests. */ void removeUpgradeRepos(); + //@} /** * Adding additional requirement diff --git a/zypp/solver/detail/Resolver.h b/zypp/solver/detail/Resolver.h index 8f65722..ee4ee7b 100644 --- a/zypp/solver/detail/Resolver.h +++ b/zypp/solver/detail/Resolver.h @@ -154,7 +154,8 @@ class Resolver : public base::ReferenceCounted, private base::NonCopyable { ResPool pool() const; void setPool( const ResPool & pool ) { _pool = pool; } - void addUpgradeRepo( Repository repo_r ) { if ( repo_r ) _upgradeRepos.insert( repo_r ); } + void addUpgradeRepo( Repository repo_r ) { if ( repo_r && ! repo_r.isSystemRepo() ) _upgradeRepos.insert( repo_r ); } + bool upgradingRepo( Repository repo_r ) const { return( _upgradeRepos.find( repo_r ) != _upgradeRepos.end() ); } void removeUpgradeRepo( Repository repo_r ) { _upgradeRepos.erase( repo_r ); } void removeUpgradeRepos() { _upgradeRepos.clear(); } const std::set<Repository> & upgradeRepos() const { return _upgradeRepos; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> SuSE-Code-11-Branch : changes 1.0.13
by Michael Andres 23 Oct '09

23 Oct '09

ref: refs/heads/SuSE-Code-11-Branch commit a2a5997f3cc072c7d9ec50c52e416efc54bbd391 Author: Michael Andres <ma(a)suse.de> Date: Fri Oct 23 11:19:39 2009 +0200 changes 1.0.13 --- VERSION.cmake | 4 ++-- package/zypper.changes | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 5bfd462..d83ef47 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "0") -SET(VERSION_PATCH "12") +SET(VERSION_PATCH "13") -# LAST RELEASED: 1.0.12 +# LAST RELEASED: 1.0.13 #======= diff --git a/package/zypper.changes b/package/zypper.changes index 1c5a924..de8ea67 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 23 11:11:27 CEST 2009 - ma(a)suse.de + +- Require at least libzypp version used at buildtime. (bnc #549205) +- 1.0.13 + +------------------------------------------------------------------- Fri Sep 25 18:36:02 CEST 2009 - jkupec(a)suse.cz - Fixed incorrect selection of update candidate (bnc #539360) @@ -33,7 +39,7 @@ Tue Feb 24 16:29:04 CET 2009 - ma(a)suse.de - Let 'zypper clean' keep the raw metadata cache of CD/DVD based repositories. We'd need the CD/DVD again to recreate the data. - If this is actually desired, explicitly remove an recreate the + If this is actually desired, explicitly remove an recreate the CD/DVD based repository. (bnc #476429). - 1.0.8 @@ -121,7 +127,7 @@ Mon Nov 24 20:44:40 CET 2008 - jkupec(a)suse.cz Mon Nov 24 16:21:02 CET 2008 - jkupec(a)suse.cz - fixed generation of solver testcases for verify and dist-upgrade -- r11789 +- r11789 ------------------------------------------------------------------- Wed Nov 19 15:57:27 CET 2008 - jkupec(a)suse.cz @@ -402,7 +408,7 @@ Sun Sep 14 00:05:59 CEST 2008 - jkupec(a)suse.cz - modifyservice --{ar,rr,cl}-to-{enable,disable} options added (fate #304915) -- modifyservice can now modify also non-service repos +- modifyservice can now modify also non-service repos - r11061 ------------------------------------------------------------------- @@ -470,8 +476,8 @@ Mon Sep 8 19:36:42 CEST 2008 - jkupec(a)suse.cz ------------------------------------------------------------------- Tue Aug 19 16:39:32 CEST 2008 - dmacvicar(a)suse.de -- confirm unsupported packages in SLE - (fate#305057) +- confirm unsupported packages in SLE + (fate#305057) ------------------------------------------------------------------- Mon Aug 18 17:50:02 CEST 2008 - dmacvicar(a)suse.de -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <zypper> SuSE-Code-11-Branch : Require at least libzypp version used at buildtime. (bnc #549205)
by Michael Andres 23 Oct '09

23 Oct '09

ref: refs/heads/SuSE-Code-11-Branch commit d03418a02a5b4987af56539a835951325272f256 Author: Michael Andres <ma(a)suse.de> Date: Fri Oct 23 11:13:00 2009 +0200 Require at least libzypp version used at buildtime. (bnc #549205) --- zypper.spec.cmake | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zypper.spec.cmake b/zypper.spec.cmake index 95c1cf9..f49b9da 100644 --- a/zypper.spec.cmake +++ b/zypper.spec.cmake @@ -14,7 +14,8 @@ Name: @PACKAGE@ BuildRequires: libzypp-devel >= 5.30.12 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps -Recommends: logrotate cron +%requires_ge libzypp +Recommends: logrotate cron License: GPL v2 or later Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -26,8 +27,8 @@ Release: 0 Source: @PACKAGE@-@VERSION@.tar.bz2 Prefix: /usr URL: http://en.opensuse.org/Zypper -Provides: y2pmsh -Obsoletes: y2pmsh +Provides: y2pmsh +Obsoletes: y2pmsh %description Command line package management tool using libzypp. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] <libzypp> master : changes 6.19.3
by Michael Andres 22 Oct '09

22 Oct '09

ref: refs/heads/master commit 915f0e42d71c913e738e02b18cd89049109c0247 Author: Michael Andres <ma(a)suse.de> Date: Thu Oct 22 15:11:22 2009 +0200 changes 6.19.3 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 203dfba..83b8d0f 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "19") SET(LIBZYPP_MINOR "19") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_PATCH "3") # -# LAST RELEASED: 6.19.2 (19) +# LAST RELEASED: 6.19.3 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 1c1d81d..56f6f09 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 22 15:09:57 CEST 2009 - ma(a)suse.de + +- Fixes to make libzypp-bindings compile. +- version 6.19.3 (19) + +------------------------------------------------------------------- Tue Oct 20 16:06:13 CEST 2009 - ma(a)suse.de - Credentials are passed as commandline options to aria2c, so strip any -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0