November 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <libzypp> master : basic fix for incorrect download speed report (bnc #537870)
by Ján Kupec 25 Nov '09

25 Nov '09

ref: refs/heads/master commit 12030effb52705de870c7246cf51737814d88364 Author: Ján Kupec <jkupec(a)suse.cz> Date: Wed Nov 25 17:07:31 2009 +0100 basic fix for incorrect download speed report (bnc #537870) - TODO: anticipate also Bs, GiBs, etc and/or convince upstream to provide machine readable output --- zypp/media/MediaAria2c.cc | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/zypp/media/MediaAria2c.cc b/zypp/media/MediaAria2c.cc index 66d4a3d..6174dcc 100644 --- a/zypp/media/MediaAria2c.cc +++ b/zypp/media/MediaAria2c.cc @@ -403,6 +403,8 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ string speedStr = progressLine.substr(left_bound, count); try { current_speed = boost::lexical_cast<double>(speedStr); + // convert to and work with bytes everywhere (bnc #537870) + current_speed *= kibs ? 0x400 : 0x100000; } catch (const std::exception&) { ERR << "Can't parse speed from '" << speedStr << "'" << endl; @@ -416,13 +418,10 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ // this is basically A: average // ((n-1)A(n-1) + Xn)/n = A(n) average_speed = - (((average_speed_count - 1 )*average_speed) + current_speed) + (((average_speed_count - 1)*average_speed) + current_speed) / average_speed_count; - // note that aria report speed in kBps or MBps, while the report takes Bps - report->progress ( progress, fileurl, - average_speed * (kibs ? 0x400 : 0x10000), - current_speed * (kibs ? 0x400 : 0x10000)); + report->progress ( progress, fileurl, average_speed, current_speed ); // clear the progress line to detect mismatches between // [# and FILE: lines progressLine.clear(); -- 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.24.0
by Michael Andres 25 Nov '09

25 Nov '09

ref: refs/heads/master commit baaf9980b3814cf90143b82abb981d44c6883d71 Author: Michael Andres <ma(a)suse.de> Date: Wed Nov 25 16:37:21 2009 +0100 changes 6.24.0 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 45debee..c0d2f1d 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "19") -SET(LIBZYPP_MINOR "23") +SET(LIBZYPP_MINOR "24") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 6.23.0 (19) +# LAST RELEASED: 6.24.0 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 534e2d4..a3dad74 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Nov 25 16:28:29 CET 2009 - ma(a)suse.de + +- Add ui::Selecatble interface for picking specific package versions + to install or delete if multiversion install is on. +- version 6.24.0 (19) + +------------------------------------------------------------------- Fri Nov 20 13:30:02 CET 2009 - ma(a)suse.de - Parse zypp.conf multiversion option and make the setting available -- 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 : Selecatble interface for picking specific package versions if multiversion install is on.
by Michael Andres 25 Nov '09

25 Nov '09

ref: refs/heads/master commit c1170f6710058480cba7abb30e2a4c12facc643f Author: Michael Andres <ma(a)suse.de> Date: Wed Nov 25 16:37:04 2009 +0100 Selecatble interface for picking specific package versions if multiversion install is on. --- zypp/ui/Selectable.cc | 8 +++++++ zypp/ui/Selectable.h | 26 +++++++++++++++++++++++ zypp/ui/SelectableImpl.cc | 16 ++++++++++++++ zypp/ui/SelectableImpl.h | 51 ++++++++++++++++++++++++++++++-------------- 4 files changed, 85 insertions(+), 16 deletions(-) diff --git a/zypp/ui/Selectable.cc b/zypp/ui/Selectable.cc index 491e02b..04d0534 100644 --- a/zypp/ui/Selectable.cc +++ b/zypp/ui/Selectable.cc @@ -135,6 +135,14 @@ namespace zypp bool Selectable::multiversionInstall() const { return _pimpl->multiversionInstall(); } + bool Selectable::pickInstall( const PoolItem & pi_r, ResStatus::TransactByValue causer_r, bool yesno_r ) + { return _pimpl->pickInstall( pi_r, causer_r, yesno_r ); } + + bool Selectable::pickDelete( const PoolItem & pi_r, ResStatus::TransactByValue causer_r, bool yesno_r ) + { return _pimpl->pickDelete( pi_r, causer_r, yesno_r ); } + + //////////////////////////////////////////////////////////////////////// + bool Selectable::isUndetermined() const { return _pimpl->isUndetermined(); } diff --git a/zypp/ui/Selectable.h b/zypp/ui/Selectable.h index 7b0b3d0..82f97dd 100644 --- a/zypp/ui/Selectable.h +++ b/zypp/ui/Selectable.h @@ -267,11 +267,37 @@ namespace zypp */ bool isUnmaintained() const; + /** \name Multiversion install. + * + * Using \ref pickInstall or \ref pickDelete with non-multiversionInstall items + * is possible, but additional constraints will apply. E.g. selecting one item for + * install will deselect any other. + */ + //@{ /** Whether different versions of this package can be installed at the same time. * Per default \c false. \see also \ref ZConfig::multiversion. */ bool multiversionInstall() const; + /** Select a specific available item for installation. + */ + bool pickInstall( const PoolItem & pi_r, ResStatus::TransactByValue causer_r = ResStatus::USER, bool yesno_r = true ); + + /** Deselect a specific available item from installation. + */ + bool pickNoInstall( const PoolItem & pi_r, ResStatus::TransactByValue causer_r = ResStatus::USER ) + { return pickInstall( pi_r, causer_r, false ); } + + /** Select a specific installed item for deletion. + */ + bool pickDelete( const PoolItem & pi_r, ResStatus::TransactByValue causer_r = ResStatus::USER, bool yesno_r = true ); + + /** Deselect a specific installed item from deletion. + */ + bool pickNoDelete( const PoolItem & pi_r, ResStatus::TransactByValue causer_r = ResStatus::USER ) + { return pickDelete( pi_r, causer_r, false ); } + //@} + /** \name Classification of available patches (pseudo installed items). * A patch is either \c not \c relevant, \c satisfied or \c broken. * The same applies to other pseudo installed kinds. diff --git a/zypp/ui/SelectableImpl.cc b/zypp/ui/SelectableImpl.cc index 58377ad..ab82c6a 100644 --- a/zypp/ui/SelectableImpl.cc +++ b/zypp/ui/SelectableImpl.cc @@ -323,6 +323,22 @@ namespace zypp return _candidate = newCandidate; } + bool Selectable::Impl::pickInstall( const PoolItem & pi_r, ResStatus::TransactByValue causer_r, bool yesno_r ) + { + if ( pi_r.satSolvable().ident() != ident() || pi_r.satSolvable().isSystem() ) + return false; // not my PoolItem or an installed one + + return pi_r.status().setTransact( yesno_r, causer_r ); + } + + bool Selectable::Impl::pickDelete( const PoolItem & pi_r, ResStatus::TransactByValue causer_r, bool yesno_r ) + { + if ( pi_r.satSolvable().ident() != ident() || ! pi_r.satSolvable().isSystem() ) + return false; // not my PoolItem or not installed + + return pi_r.status().setTransact( yesno_r, causer_r ); + } + ResStatus::TransactByValue Selectable::Impl::modifiedBy() const { PoolItem cand( candidateObj() ); diff --git a/zypp/ui/SelectableImpl.h b/zypp/ui/SelectableImpl.h index b30d772..e5167a2 100644 --- a/zypp/ui/SelectableImpl.h +++ b/zypp/ui/SelectableImpl.h @@ -91,12 +91,13 @@ namespace zypp /** */ bool setStatus( const Status state_r, ResStatus::TransactByValue causer_r ); - /** Installed object. */ + /** Installed object (transacting ot highest version). */ PoolItem installedObj() const { - if (!installedEmpty()) - return *_installedItems.begin(); + if ( installedEmpty() ) return PoolItem(); + PoolItem ret( transactingInstalled() ); + return ret ? ret : *_installedItems.begin(); } /** Best among available objects. @@ -140,9 +141,10 @@ namespace zypp */ PoolItem updateCandidateObj() const { - if ( installedEmpty() || ! _defaultCandidate ) + if ( multiversionInstall() || installedEmpty() || ! _defaultCandidate ) return _defaultCandidate; - // Here: installed and _defaultCandidate are non NULL. + // Here: installed and _defaultCandidate are non NULL and it's not a + // multiversion install. // update candidate must come from the highest priority repo if ( _defaultCandidate->repoInfo().priority() != (*availableBegin())->repoInfo().priority() ) @@ -186,13 +188,9 @@ namespace zypp PoolItem theObj() const { PoolItem ret( candidateObj() ); - if (ret) - return ret; - - if ( ! _installedItems.empty() ) - return (*_installedItems.begin()); - - return PoolItem(); + if ( ret ) + return ret; + return installedObj(); } //////////////////////////////////////////////////////////////////////// @@ -231,6 +229,12 @@ namespace zypp bool multiversionInstall() const { return theObj().satSolvable().multiversionInstall(); } + bool pickInstall( const PoolItem & pi_r, ResStatus::TransactByValue causer_r, bool yesno_r ); + + bool pickDelete( const PoolItem & pi_r, ResStatus::TransactByValue causer_r, bool yesno_r ); + + //////////////////////////////////////////////////////////////////////// + bool isUndetermined() const { PoolItem cand( candidateObj() ); @@ -264,10 +268,19 @@ namespace zypp { if ( candidateObj() ) candidateObj().status().setLicenceConfirmed( val_r ); } private: + PoolItem transactingInstalled() const + { + for_( it, installedBegin(), installedEnd() ) + { + if ( (*it).status().transacts() ) + return (*it); + } + return PoolItem(); + } + PoolItem transactingCandidate() const { - for ( available_const_iterator it = availableBegin(); - it != availableEnd(); ++it ) + for_( it, availableBegin(), availableEnd() ) { if ( (*it).status().transacts() ) return (*it); @@ -277,7 +290,7 @@ namespace zypp PoolItem defaultCandidate() const { - if ( !installedEmpty() ) + if ( ! ( multiversionInstall() || installedEmpty() ) ) { // prefer the installed objects arch and vendor bool solver_allowVendorChange( ZConfig::instance().solver_allowVendorChange() ); @@ -356,10 +369,16 @@ namespace zypp str << " (I 0) {}" << endl << " "; else { + PoolItem icand( obj.installedObj() ); str << " (I " << obj.installedSize() << ") {" << endl; for_( it, obj.installedBegin(), obj.installedEnd() ) { - str << " " << *it << endl; + char t = ' '; + if ( *it == icand ) + { + t = 'i'; + } + str << " " << t << " " << *it << endl; } 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] <libzypp-bindings> master : use %{py_sitedir}
by Michael Andres 24 Nov '09

24 Nov '09

ref: refs/heads/master commit 7dd2abb38483dd0058538a272e3f242a1d2db45d Author: Michael Andres <ma(a)suse.de> Date: Tue Nov 24 17:14:06 2009 +0100 use %{py_sitedir} --- libzypp-bindings.spec.cmake | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libzypp-bindings.spec.cmake b/libzypp-bindings.spec.cmake index 6ffe3b6..a5fc442 100644 --- a/libzypp-bindings.spec.cmake +++ b/libzypp-bindings.spec.cmake @@ -21,11 +21,6 @@ BuildRequires: cmake gcc-c++ python-devel ruby-devel swig BuildRequires: libzypp-devel >= 5.8.0 Source: %{name}-%{version}.tar.bz2 -%if 0%{?suse_version} == 1110 -# not present on sle11-sp1: -%define python_sitelib %{_libdir}/python%{python_version}/site-packages -%endif - %description This package provides bindings for libzypp, the library for package management. @@ -76,8 +71,8 @@ Group: Development/Languages/Python %files -n python-zypp %defattr(-,root,root,-) -%{python_sitelib}/_zypp.so -%{python_sitelib}/zypp.py +%{py_sitedir}/_zypp.so +%{py_sitedir}/zypp.py %package -n perl-zypp Requires: perl = %{perl_version} -- 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 : use %{_libdir}
by Michael Andres 24 Nov '09

24 Nov '09

ref: refs/heads/master commit 0505641b50194c1276cfe5e01921ae60d892c6a7 Author: Michael Andres <ma(a)suse.de> Date: Tue Nov 24 13:50:08 2009 +0100 use %{_libdir} --- libzypp-bindings.spec.cmake | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libzypp-bindings.spec.cmake b/libzypp-bindings.spec.cmake index 85aedad..6ffe3b6 100644 --- a/libzypp-bindings.spec.cmake +++ b/libzypp-bindings.spec.cmake @@ -23,7 +23,7 @@ Source: %{name}-%{version}.tar.bz2 %if 0%{?suse_version} == 1110 # not present on sle11-sp1: -%define python_sitelib /usr/lib/python%{python_version}/site-packages +%define python_sitelib %{_libdir}/python%{python_version}/site-packages %endif %description -- 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 : Fix to build on sle11-sp1
by Michael Andres 24 Nov '09

24 Nov '09

ref: refs/heads/master commit 60317182679a5146fdd7950b910e43b33d536d80 Author: Michael Andres <ma(a)suse.de> Date: Tue Nov 24 13:40:09 2009 +0100 Fix to build on sle11-sp1 --- libzypp-bindings.spec.cmake | 5 +++++ package/libzypp-bindings.changes | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/libzypp-bindings.spec.cmake b/libzypp-bindings.spec.cmake index 23aa13e..85aedad 100644 --- a/libzypp-bindings.spec.cmake +++ b/libzypp-bindings.spec.cmake @@ -21,6 +21,11 @@ BuildRequires: cmake gcc-c++ python-devel ruby-devel swig BuildRequires: libzypp-devel >= 5.8.0 Source: %{name}-%{version}.tar.bz2 +%if 0%{?suse_version} == 1110 +# not present on sle11-sp1: +%define python_sitelib /usr/lib/python%{python_version}/site-packages +%endif + %description This package provides bindings for libzypp, the library for package management. diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes index 30ee4ca..11cbc2c 100644 --- a/package/libzypp-bindings.changes +++ b/package/libzypp-bindings.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Nov 24 13:38:52 CET 2009 - ma(a)suse.de + +- Fix to build on sle11-sp1 + +------------------------------------------------------------------- Tue Sep 22 21:41:23 CEST 2009 - ma(a)suse.de - Remove reference to dead zypp::ScanDBReport. -- 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> SuSE-Code-11-Branch : support optionally compressed product(s).xml
by Michael Andres 23 Nov '09

23 Nov '09

ref: refs/heads/SuSE-Code-11-Branch commit 838c26db642152b999dccdc0b7eb3a248c4c2482 Author: Michael Andres <ma(a)suse.de> Date: Mon Nov 23 16:19:26 2009 +0100 support optionally compressed product(s).xml --- tools/repo2solv.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/repo2solv.sh b/tools/repo2solv.sh index 0995d33..8c959de 100755 --- a/tools/repo2solv.sh +++ b/tools/repo2solv.sh @@ -99,7 +99,7 @@ if test "$repotype" = rpmmd ; then fi prodfile="/nonexist" - if test -f product.xml; then + if test -f product.xml || test -f product.xml.gz || test -f product.xml.bz2 || products.xml || test -f products.xml.gz || test -f products.xml.bz2 ; then prodfile=`mktemp` || exit 3 ( echo '<products>' -- 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 : Get (optionally compressed) product.xml from repomd
by Michael Andres 23 Nov '09

23 Nov '09

ref: refs/heads/master commit 921680a84c12a2c8ff38af6845379da439d46e5c Author: Michael Andres <ma(a)suse.de> Date: Mon Nov 23 16:14:33 2009 +0100 Get (optionally compressed) product.xml from repomd --- tools/repo2solv.sh | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/repo2solv.sh b/tools/repo2solv.sh index 65bfdce..512a6aa 100755 --- a/tools/repo2solv.sh +++ b/tools/repo2solv.sh @@ -116,13 +116,15 @@ if test "$repotype" = rpmmd ; then fi prodfile= - if test -f product.xml; then + prodxml=`repomd_findfile product product.xml` + if test -z "$prodxml" ; then + prodxml=`repomd_findfile products products.xml` + fi + if test -n "$prodxml" -a -s "$prodxml" ; then prodfile=`mktemp` || exit 3 ( echo '<products>' - for i in product*.xml*; do - repomd_decompress $i - done + repomd_decompress "$prodxml" echo '</products>' ) | grep -v '\?xml' | rpmmd2solv $parser_options > $prodfile || exit 4 fi -- 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 : update to reflect current implementation
by Ján Kupec 23 Nov '09

23 Nov '09

ref: refs/heads/master commit bbbebb1b7e259d6ce12a74f67b40ebd7c15c2d51 Author: Ján Kupec <jkupec(a)suse.cz> Date: Mon Nov 23 11:59:30 2009 +0100 update to reflect current implementation --- zypp/parser/yum/schema/repoindex.rnc | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/zypp/parser/yum/schema/repoindex.rnc b/zypp/parser/yum/schema/repoindex.rnc index bc32693..f3feb18 100644 --- a/zypp/parser/yum/schema/repoindex.rnc +++ b/zypp/parser/yum/schema/repoindex.rnc @@ -1,5 +1,6 @@ -# NU service index file schema. -# +# Repository Index XML file schema +# see http://en.opensuse.org/Standards/Repository_Index_Service +# # Elements: # # repoindex @@ -11,8 +12,8 @@ # distro_target - target distribution # priority - priority of repository # pub - ??? -# path - relative path to repository -# +# path - path relative to the repoindex.xml parent dir URL +# url - full URI of the repository element repoindex { element repo { @@ -22,7 +23,10 @@ element repoindex { attribute distro_target { xsd:string }, attribute priority { xsd:integer }?, attribute pub { xsd:integer }?, - attribute path { xsd:string } + ( + attribute url {xsd:anyURI} | + attribute path { xsd:string } + ) }+, 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> master : Allow scripts and messages also to be named 'n-v-r', not just 'n-v-r-*'
by Michael Andres 23 Nov '09

23 Nov '09

ref: refs/heads/master commit bdb849d084faba43f39b01ef66b5fb1f88b3e90a Author: Michael Andres <ma(a)suse.de> Date: Mon Nov 23 11:33:18 2009 +0100 Allow scripts and messages also to be named 'n-v-r', not just 'n-v-r-*' --- zypp/target/TargetImpl.cc | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc index 87c1bbe..5ebd361 100644 --- a/zypp/target/TargetImpl.cc +++ b/zypp/target/TargetImpl.cc @@ -223,10 +223,12 @@ namespace zypp // Now collect and execute all matching scripts. // On ABORT: at least log all outstanding scripts. + // - "name-version-release" + // - "name-version-release-*" bool abort = false; for_( it, checkPackages_r.begin(), checkPackages_r.end() ) { - std::string prefix( str::form( "%s-%s-", it->name().c_str(), it->edition().c_str() ) ); + std::string prefix( str::form( "%s-%s", it->name().c_str(), it->edition().c_str() ) ); for_( sit, scripts.begin(), scripts.end() ) { if ( ! str::hasPrefix( *sit, prefix ) ) @@ -236,6 +238,9 @@ namespace zypp if ( ! script.isFile() ) continue; + if ( (*sit)[prefix.size()] != '\0' && (*sit)[prefix.size()] != '-' ) + continue; // if not exact match it had to continue with '-' + if ( abort || aborting_r ) { WAR << "Aborting: Skip update script " << *sit << endl; @@ -418,15 +423,20 @@ namespace zypp return; // no messages in message dir // Now collect all matching messages in result and send them + // - "name-version-release" + // - "name-version-release-*" HistoryLog historylog; for_( it, checkPackages_r.begin(), checkPackages_r.end() ) { - std::string prefix( str::form( "%s-%s-", it->name().c_str(), it->edition().c_str() ) ); + std::string prefix( str::form( "%s-%s", it->name().c_str(), it->edition().c_str() ) ); for_( sit, messages.begin(), messages.end() ) { if ( ! str::hasPrefix( *sit, prefix ) ) continue; + if ( (*sit)[prefix.size()] != '\0' && (*sit)[prefix.size()] != '-' ) + continue; // if not exact match it had to continue with '-' + PathInfo message( messagesDir / *sit ); if ( ! message.isFile() || message.size() == 0 ) continue; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0