September 2009 - Zypp Commits - openSUSE Mailing Lists

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

23 Sep '09

ref: refs/heads/master commit 766a94991d93f0547ac6b5e99cddbae7120c0d71 Author: Ján Kupec <jkupec(a)suse.cz> Date: Wed Sep 23 13:34:22 2009 +0200 changes --- package/zypper.changes | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/package/zypper.changes b/package/zypper.changes index a349fd8..895fc11 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Sep 23 13:33:48 CEST 2009 - jkupec(a)suse.cz + +- Fixed troubleshooting wiki link (bnc #533606) + +------------------------------------------------------------------- Mon Sep 21 10:38:38 CEST 2009 - jkupec(a)suse.cz - 'zypper ps' added to list processes using deleted files -- 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 troubleshooting wiki link (bnc #533606)
by Ján Kupec 23 Sep '09

23 Sep '09

ref: refs/heads/master commit 73286cafb968e3cabe1fd36d7bae2717638a97e2 Author: Ján Kupec <jkupec(a)suse.cz> Date: Wed Sep 23 13:33:22 2009 +0200 Fixed troubleshooting wiki link (bnc #533606) --- src/repos.cc | 2 +- src/utils/messages.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/repos.cc b/src/repos.cc index dbcc4c1..24d536e 100644 --- a/src/repos.cc +++ b/src/repos.cc @@ -247,7 +247,7 @@ static bool build_cache(Zypper & zypper, const RepoInfo &repo, bool force_build) _("This may be caused by invalid metadata in the repository," " or by a bug in the metadata parser. In the latter case," " or if in doubt, please, file a bug report by following" - " instructions at http://en.opensuse.org/Zypper#Troubleshooting")); + " instructions at http://en.opensuse.org/Zypper/Troubleshooting")); // log untranslated message ERR << format("Error parsing metadata for '%s':") % repo.name() << endl; diff --git a/src/utils/messages.cc b/src/utils/messages.cc index 0bcb855..4d88579 100644 --- a/src/utils/messages.cc +++ b/src/utils/messages.cc @@ -22,7 +22,7 @@ void report_a_bug (Out & out) s <<_("Please file a bug report about this.") << endl // TranslatorExplanation remember not to translate the URL // unless you translate the actual page :) - << _("See http://en.opensuse.org/Zypper#Troubleshooting for instructions."); + << _("See http://en.opensuse.org/Zypper/Troubleshooting for instructions."); out.error(s.str()); } -- 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] <sat-solver> master : - add changes, bump version
by Michael Schroeder 23 Sep '09

23 Sep '09

ref: refs/heads/master commit 3cf1f09a766b6b2323db55dfdd2ec812a7eac3c8 Author: Michael Schroeder <mls(a)suse.de> Date: Wed Sep 23 11:17:10 2009 +0200 - add changes, bump version --- VERSION.cmake | 4 ++-- package/libsatsolver.changes | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 9d3c8cc..beed70e 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -46,6 +46,6 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "14") -SET(LIBSATSOLVER_PATCH "7") +SET(LIBSATSOLVER_PATCH "8") -# last released 0.14.7 +# last released 0.14.8 diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index bbca5a2..0326916 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Sep 23 11:10:08 CEST 2009 - mls(a)suse.de + +- get missing translations from other solvables [bnc#386449] +- also look at triggers when ordering packages +- add support for REPOKEY_TYPE_BINARY +- 0.14.8 + +------------------------------------------------------------------- Wed Sep 16 10:56:44 CEST 2009 - mls(a)suse.de - use repomdxml to query for the location [bnc#501425] -- 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-bindings> master : changes 0.5.2
by Michael Andres 22 Sep '09

22 Sep '09

ref: refs/heads/master commit 757fee86c8b4bbd6831f26800346766b11b3ef21 Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 22 21:43:07 2009 +0200 changes 0.5.2 --- VERSION.cmake | 2 +- package/libzypp-bindings.changes | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 446415e..8bce156 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "5") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes index 0f02bad..30ee4ca 100644 --- a/package/libzypp-bindings.changes +++ b/package/libzypp-bindings.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 22 21:41:23 CEST 2009 - ma(a)suse.de + +- Remove reference to dead zypp::ScanDBReport. +- version 0.5.2 + +------------------------------------------------------------------- Sun Aug 9 08:44:46 CEST 2009 - coolo(a)novell.com - use new python macros -- 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-bindings> master : Remove reference to dead zypp::ScanDBReport.
by Michael Andres 22 Sep '09

22 Sep '09

ref: refs/heads/master commit af34fb655f2f3821c6dcbbabe8efbc643a48d691 Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 22 21:42:55 2009 +0200 Remove reference to dead zypp::ScanDBReport. --- swig/python/callbacks.i | 68 ----------------------------------------------- 1 files changed, 0 insertions(+), 68 deletions(-) diff --git a/swig/python/callbacks.i b/swig/python/callbacks.i index 5367bfd..6f234fd 100644 --- a/swig/python/callbacks.i +++ b/swig/python/callbacks.i @@ -1,71 +1,3 @@ -struct ScanRpmDbReceive -{ - void set_pymethod(PyObject *pyfunc); -}; - %{ - namespace zypp - { - struct ScanRpmDbReceive : public callback::ReceiveReport<target::rpm::ScanDBReport> - { - typedef target::rpm::ScanDBReport Report; - - ScanRpmDbReceive() - : _pyfunc( 0 ) - { connect(); } - - ~ScanRpmDbReceive() - { disconnect(); } - - virtual void start() - { - std::cerr << "ScanRpmDbReceive start" << std::endl; - _last = -1; - } - - virtual bool progress(int value) - { - if ( value == _last ) - return Report::progress( value ); - _last = value; - - if ( ! _pyfunc ) - return Report::progress( value ); - - bool ret = Report::progress( value ); - PyObject * arglist = Py_BuildValue( "(i)", value ); // Build argument list - PyObject * result = PyEval_CallObject( _pyfunc, arglist ); // Call Python - Py_DECREF( arglist ); // Trash arglist - if ( result ) { // If no errors, return bool - ret = PyLong_AsLong( result ); - } - Py_XDECREF( result ); - return ret; - } - - virtual Action problem( target::rpm::ScanDBReport::Error error, const std::string & description ) - { - //std::cerr << "ScanRpmDbReceive problem" << std::endl; - return Report::problem( error, description ); - } - - virtual void finish( Error error, const std::string & reason ) - { - //std::cerr << "ScanRpmDbReceive finish" << std::endl; - } - - void set_pymethod( PyObject * pyfunc_r ) - { - Py_INCREF( pyfunc_r ); - if ( _pyfunc ) - Py_DECREF( _pyfunc ); - _pyfunc = pyfunc_r; - } - - private: - int _last; - PyObject * _pyfunc; - }; - } %} -- 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> SuSE-Code-11-Branch : have to use code11 interfaces.
by Michael Andres 22 Sep '09

22 Sep '09

ref: refs/heads/SuSE-Code-11-Branch commit db9b06a368559e8486a6f3bc4dc26515ad3f0011 Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 22 21:25:31 2009 +0200 have to use code11 interfaces. --- zypp/ui/SelectableImpl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zypp/ui/SelectableImpl.h b/zypp/ui/SelectableImpl.h index bfd3584..05965a0 100644 --- a/zypp/ui/SelectableImpl.h +++ b/zypp/ui/SelectableImpl.h @@ -252,7 +252,7 @@ namespace zypp { if ( (*iit)->arch() == (*it)->arch() ) { - if ( VendorAttr::instance().equivalent( (*iit), (*it) ) ) + if ( VendorAttr::instance().equivalent( (*iit)->vendor(), (*it)->vendor() ) ) return *it; else if ( ! sameArch ) // remember best same arch in case no same vendor found sameArch = *it; -- 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> SuSE-Code-11-Branch : Take vendor into account when computing the Selectables default candidate.
by Michael Andres 22 Sep '09

22 Sep '09

ref: refs/heads/SuSE-Code-11-Branch commit 697e6a6136cb82268b4e1aff9eb2b8962b1927f0 Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 22 21:03:40 2009 +0200 Take vendor into account when computing the Selectables default candidate. --- zypp/ui/SelectableImpl.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/zypp/ui/SelectableImpl.h b/zypp/ui/SelectableImpl.h index 7662acc..bfd3584 100644 --- a/zypp/ui/SelectableImpl.h +++ b/zypp/ui/SelectableImpl.h @@ -246,14 +246,20 @@ namespace zypp for ( installed_const_iterator iit = installedBegin(); iit != installedEnd(); ++iit ) { + PoolItem sameArch; // in case there's no same vendor at least stay with same arch for ( available_const_iterator it = availableBegin(); it != availableEnd(); ++it ) { if ( (*iit)->arch() == (*it)->arch() ) { - return (*it); + if ( VendorAttr::instance().equivalent( (*iit), (*it) ) ) + return *it; + else if ( ! sameArch ) // remember best same arch in case no same vendor found + sameArch = *it; } } + if ( sameArch ) + return sameArch; } } if ( _availableItems.empty() ) -- 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> SuSE-Code-11-Branch : changes 5.30.12
by Michael Andres 22 Sep '09

22 Sep '09

ref: refs/heads/SuSE-Code-11-Branch commit 5ea82f740fe547cfa93aa7a44ffb2ad568d0d6cc Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 22 20:55:25 2009 +0200 changes 5.30.12 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index a766157..aa3140c 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -51,8 +51,8 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "30") -SET(LIBZYPP_PATCH "11") +SET(LIBZYPP_PATCH "12") # -# LAST RELEASED: 5.30.11 (23) +# LAST RELEASED: 5.30.12 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 3dfc68b..b75d4d3 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Sep 22 20:52:23 CEST 2009 - ma(a)suse.de + +- Add Selectable::updateCandidateObj returning the candidate for + update, if there is one. The updateCandidate must not violate + any active solver policy. +- version 5.30.12 (23) + +------------------------------------------------------------------- Thu Sep 10 11:51:28 CEST 2009 - ma(a)suse.de - ProxyInfoSysconfig: take care variables get initialized. -- 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> SuSE-Code-11-Branch : Add Selectable::updateCandidateObj returning the candidate for update, if there is one.
by Michael Andres 22 Sep '09

22 Sep '09

ref: refs/heads/SuSE-Code-11-Branch commit c831edcdc459f953e7a6c764d448c8d6cadd0532 Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 22 20:55:04 2009 +0200 Add Selectable::updateCandidateObj returning the candidate for update, if there is one. --- zypp/ui/Selectable.cc | 3 +++ zypp/ui/Selectable.h | 11 ++++++++++- zypp/ui/SelectableImpl.h | 42 +++++++++++++++++++++++++++++++++++++----- 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/zypp/ui/Selectable.cc b/zypp/ui/Selectable.cc index 2588faa..62bf2ea 100644 --- a/zypp/ui/Selectable.cc +++ b/zypp/ui/Selectable.cc @@ -73,6 +73,9 @@ namespace zypp PoolItem Selectable::candidateObj() const { return _pimpl->candidateObj(); } + PoolItem Selectable::updateCandidateObj() const + { return _pimpl->updateCandidateObj(); } + PoolItem Selectable::setCandidate( const PoolItem & newCandidate_r, ResStatus::TransactByValue causer_r ) { return _pimpl->setCandidate( newCandidate_r, causer_r ); } diff --git a/zypp/ui/Selectable.h b/zypp/ui/Selectable.h index a300eaa..c5cd548 100644 --- a/zypp/ui/Selectable.h +++ b/zypp/ui/Selectable.h @@ -120,10 +120,19 @@ namespace zypp PoolItem installedObj() const; /** The 'best' or 'most interesting' among all available objects. - * One that is, or is likely to be, chosen for installation. + * One that is, or is likely to be, chosen for installation, unless + * it violated any solver policy (see \ref updateCandidateObj). */ PoolItem candidateObj() const; + /** The best candidate for update, if there is one. + * In contrary to \ref candidateObj, this may return no item even if + * there are available objects. This simply means the best object is + * already installed, and all available objects violate at least one + * update policy. + */ + PoolItem updateCandidateObj() const; + /** Return the \ref installedObj resolvable casted to a specific kind. * \code * Selectable mySelectable; diff --git a/zypp/ui/SelectableImpl.h b/zypp/ui/SelectableImpl.h index 3c70d67..7662acc 100644 --- a/zypp/ui/SelectableImpl.h +++ b/zypp/ui/SelectableImpl.h @@ -68,6 +68,7 @@ namespace zypp else _availableItems.insert( *it ); } + _defaultCandidate = defaultCandidate(); } public: @@ -106,10 +107,7 @@ namespace zypp PoolItem ret( transactingCandidate() ); if ( ret ) return ret; - - if ( _candidate ) - return _candidate; - return defaultCandidate(); + return _candidate ? _candidate : _defaultCandidate; } /** Set a userCandidate (out of available objects). @@ -118,6 +116,38 @@ namespace zypp */ PoolItem setCandidate( const PoolItem & newCandidate_r, ResStatus::TransactByValue causer_r ); + /** The best candidate for update, if there is one. + * In contrary to \ref candidateObj, this may return no item even if + * there are available objects. This simply means the best object is + * already installed, and all available objects violate at least one + * update policy. + */ + PoolItem updateCandidateObj() const + { + if ( installedEmpty() || ! _defaultCandidate ) + return _defaultCandidate; + // Here: installed and _defaultCandidate are non NULL. + + // update candidate must come from the highest priority repo + if ( _defaultCandidate->repoInfo().priority() != (*availableBegin())->repoInfo().priority() ) + return PoolItem(); + + PoolItem installed( installedObj() ); + // check vendor change + if ( ! VendorAttr::instance().equivalent( _defaultCandidate->vendor(), installed->vendor() ) ) + return PoolItem(); + + // check arch change + if ( _defaultCandidate->arch() != installed->arch() ) + return PoolItem(); + + // check greater edition + if ( _defaultCandidate->edition() <= installed->edition() ) + return PoolItem(); + + return _defaultCandidate; + } + /** Best among all objects. */ PoolItem theObj() const { @@ -142,7 +172,6 @@ namespace zypp available_const_iterator availableBegin() const { return _availableItems.begin(); } - available_const_iterator availableEnd() const { return _availableItems.end(); } @@ -250,6 +279,9 @@ namespace zypp const std::string _name; InstalledItemSet _installedItems; AvailableItemSet _availableItems; + //! Best among availabe with restpect to installed. + PoolItem _defaultCandidate; + //! The object selected by setCandidateObj() method. PoolItem _candidate; }; -- 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.17.1
by Michael Andres 22 Sep '09

22 Sep '09

ref: refs/heads/master commit 6d205ad44d9d6daabec0895eec48ba7242bcfd87 Author: Michael Andres <ma(a)suse.de> Date: Tue Sep 22 20:35:36 2009 +0200 changes 6.17.1 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 1e39ca5..685624a 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "17") SET(LIBZYPP_MINOR "17") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 6.17.0 (17) +# LAST RELEASED: 6.17.1 (17) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index f1cec25..d9032ce 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Sep 22 20:32:38 CEST 2009 - ma(a)suse.de + +- Add Selectable::updateCandidateObj returning the candidate for + update, if there is one. The updateCandidate must not violate + any active solver policy. +- version 6.17.1 (17) + +------------------------------------------------------------------- Fri Sep 18 17:20:37 CEST 2009 - ma(a)suse.de - Make sure rpmReadConfigFiles was called before using librpm (bnc #539603). -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0