November 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <libzypp> SuSE-Code-11-Branch : Following https redirections requires at least libcurl4-7.19.4. (bnc #553895)
by Michael Andres 10 Nov '09

10 Nov '09

ref: refs/heads/SuSE-Code-11-Branch commit 9b7abd9b049ff6c87918fbd7e71c635a01843d13 Author: Michael Andres <ma(a)suse.de> Date: Tue Nov 10 14:32:10 2009 +0100 Following https redirections requires at least libcurl4-7.19.4. (bnc #553895) --- libzypp.spec.cmake | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake index fb06bfd..be613bb 100644 --- a/libzypp.spec.cmake +++ b/libzypp.spec.cmake @@ -26,7 +26,7 @@ Obsoletes: yast2-packagemanager Recommends: logrotate BuildRequires: cmake BuildRequires: libsatsolver-devel >= 0.13.0 openssl-devel -BuildRequires: boost-devel curl-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel +BuildRequires: boost-devel dejagnu doxygen gcc-c++ gettext-devel graphviz hal-devel libxml2-devel %if 0%{?suse_version} BuildRequires: libexpat-devel @@ -50,15 +50,19 @@ BuildRequires: librpm-devel Requires: e2fsprogs %endif - - %if 0%{?suse_version} Requires: gpg2 %else Requires: gnupg %endif + %requires_eq satsolver-tools +# need CURLOPT_REDIR_PROTOCOLS: +%min_curl_version 7.19.4 +Requires: libcurl4 >= %{min_curl_version} +BuildRequires: curl-devel >= %{min_curl_version} + %description Package, Patch, Pattern, and Product Management @@ -75,9 +79,10 @@ Authors: %package devel Requires: libzypp == %{version} -Requires: libxml2-devel curl-devel openssl-devel rpm-devel glibc-devel zlib-devel +Requires: libxml2-devel openssl-devel rpm-devel glibc-devel zlib-devel Requires: bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel Requires: cmake libsatsolver-devel >= 0.13.0 +Requires: curl-devel >= %{min_curl_version} Summary: Package, Patch, Pattern, and Product Management - developers files Group: System/Packages Provides: yast2-packagemanager-devel -- 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] Build failed in Hudson: zypper-head-i586 #402
by Hudson Integration Service 10 Nov '09

10 Nov '09

See http://yast.suse.de:3334/job/zypper-head-i586/402/changes Changes: [Michael Andres] changes 1.2.10 (resubmit, changelog entry was lost in merge) ------------------------------------------ A SCM change trigger started this job Checkout [workspace] $ git fetch Checking out origin/master [workspace] $ git checkout -f origin/master Previous HEAD position was 8eb9ec7... changes HEAD is now at 8f0a93d... changes 1.2.10 (resubmit, changelog entry was lost in merge) [workspace] $ git rev-parse origin/master [workspace] $ git log --numstat -M --summary --pretty=raw 8eb9ec7403c12a8ae7d8cd18b6458cefe3644502..8f0a93d4186c1386b8b384eea2e8388a864b6b57 [workspace] $ /bin/sh -xe /tmp/hudson7658552266377268091.sh + sudo -E /data/hudson/bin/build-chroot.sh zypp zypper head-i586 ..copying source code http://yast.suse.de:3334/job/zypper-head-i586/ws/* /data/hudson/HUDSON-CHROOT/zypp-head-i586/src/zypper ..copying make script to /data/hudson/HUDSON-CHROOT/zypp-head-i586/root ... mounting sys ... mounting proc ... mounting pts mount: special device none does not exist Can't mount devpts /data/hudson/HUDSON-CHROOT/zypp-head-i586/dev/pts ... switching to chroot and starting build ??,????????'????????,????,????????'????????,????,????????'????????,????,????????'????????,????,????????'????????,?? ??,????????'????????,????,????????'????????,????,????????'????????,????,????????'????????,????,????????'????????,?? starting build of zypper -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /opt/icecream/bin/gcc -- Check for working C compiler: /opt/icecream/bin/gcc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working CXX compiler: /opt/icecream/bin/g++ -- Check for working CXX compiler: /opt/icecream/bin/g++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Libraries will be installed in /usr/lib -- Config files will be installed in /etc ** Manual files will be installed in /usr/share/man -- Writing spec file... -- I hate you rpm-lint...!!! -- ZYpp path not set. Looking for it. -- ZYpp found: includes in /usr/include, library in /usr/lib/libzypp.so -- readline found: includes in /usr/include, library in /usr/lib/libreadline.so -- augeas found: includes in /usr/include, library in /usr/lib/libaugeas.so ** Locale dir is /usr/share/locale ** ZYpper binary will be installed in /usr/bin -- Configuring done -- Generating done -- Build files have been written to: /build/zypper exit code: 0 ... good, lets continue Scanning dependencies of target srcpackage Scanning dependencies of target svncheck Built target svncheck Run CPack packaging tool for source... CPack: Create package using TBZ2 CPack: Install projects CPack: - Install directory: /src/zypper CPack: Compress package CPack: Finalize package CPack: Package /build/zypper/zypper-1.2.10.tar.bz2 generated. Built target srcpackage exit code: 0 ... good, lets continue exit code: 0 ... good, lets continue error: Failed build dependencies: libzypp-devel >= 6.21.4 is needed by zypper-1.2.10-0.src ( ) ( ) ( ) _ ) ( \_ _(_\ \)__ (____\___)) build failed stopping dbus.. Shutting down D-Bus daemon..done ... unmounting sys ... unmounting proc ... unmounting pts umount: /data/hudson/HUDSON-CHROOT/zypp-head-i586/dev/pts: not mounted Can't unmount devpts /data/hudson/HUDSON-CHROOT/zypp-head-i586/dev/pts Archiving artifacts -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 1

[zypp-commit] <zypper> master : changes 1.2.10 (resubmit, changelog entry was lost in merge)
by Michael Andres 10 Nov '09

10 Nov '09

ref: refs/heads/master commit 8f0a93d4186c1386b8b384eea2e8388a864b6b57 Author: Michael Andres <ma(a)suse.de> Date: Tue Nov 10 10:48:29 2009 +0100 changes 1.2.10 (resubmit, changelog entry was lost in merge) --- package/zypper.changes | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/package/zypper.changes b/package/zypper.changes index 12280c2..2426e3c 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -2,6 +2,7 @@ Fri Nov 6 19:47:49 CET 2009 - ma(a)suse.de - Fix zypper to use up-to-date RepoInfos. (bnc #544432) +- 1.2.10 ------------------------------------------------------------------- Fri Nov 6 15:35:46 CET 2009 - jkupec(a)suse.cz -- 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] Build failed in Hudson: zypper-head-x86_64 #6056
by Hudson Integration Service 06 Nov '09

06 Nov '09

See http://yast.suse.de:3334/job/zypper-head-x86_64/6056/changes Changes: [Michael Andres] al/rl: Support 'kind:name' notation if -t is not given (bnc 551956) It's convenient, and as -t not supported by rl, it's the only way to tell to remove a specific non-package lock. [Michael Andres] Zypper must not remove locks which do not match what commandline options specify. (bnc 551956) [Michael Andres] changes 1.2.10 ------------------------------------------ A SCM change trigger started this job Checkout [workspace] $ git fetch Checking out origin/master [workspace] $ git checkout -f origin/master Previous HEAD position was e6a5589... fixed fr.po HEAD is now at 68131d5... changes 1.2.10 [workspace] $ git rev-parse origin/master [workspace] $ git log --numstat -M --summary --pretty=raw e6a558993f3b86cdd9f6b001aed4a589be19f188..68131d503793e10343cbdfe51985b226d1eadcdb [workspace] $ /bin/sh -xe /tmp/hudson8390753141966431128.sh + sudo -E /data/hudson/bin/build-chroot.sh zypp zypper head-x86_64 ..copying source code http://yast.suse.de:3334/job/zypper-head-x86_64/ws/* /data/hudson/HUDSON-CHROOT/zypp-head-x86_64/src/zypper ..copying make script to /data/hudson/HUDSON-CHROOT/zypp-head-x86_64/root ... mounting sys ... mounting proc ... mounting pts mount: special device none does not exist Can't mount devpts /data/hudson/HUDSON-CHROOT/zypp-head-x86_64/dev/pts ... switching to chroot and starting build ??,????????'????????,????,????????'????????,????,????????'????????,????,????????'????????,????,????????'????????,?? ??,????????'????????,????,????????'????????,????,????????'????????,????,????????'????????,????,????????'????????,?? starting build of zypper -- The C compiler identification is GNU -- The CXX compiler identification is GNU -- Check for working C compiler: /opt/icecream/bin/gcc -- Check for working C compiler: /opt/icecream/bin/gcc -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working CXX compiler: /opt/icecream/bin/g++ -- Check for working CXX compiler: /opt/icecream/bin/g++ -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Libraries will be installed in /usr/lib64 -- Config files will be installed in /etc ** Manual files will be installed in /usr/share/man -- Writing spec file... -- I hate you rpm-lint...!!! -- ZYpp path not set. Looking for it. -- ZYpp found: includes in /usr/include, library in /usr/lib64/libzypp.so -- readline found: includes in /usr/include, library in /usr/lib64/libreadline.so -- augeas found: includes in /usr/include, library in /usr/lib64/libaugeas.so ** Locale dir is /usr/share/locale ** ZYpper binary will be installed in /usr/bin -- Configuring done -- Generating done -- Build files have been written to: /build/zypper exit code: 0 ... good, lets continue Scanning dependencies of target srcpackage Scanning dependencies of target svncheck Built target svncheck Run CPack packaging tool for source... CPack: Create package using TBZ2 CPack: Install projects CPack: - Install directory: /src/zypper CPack: Compress package CPack: Finalize package CPack: Package /build/zypper/zypper-1.2.10.tar.bz2 generated. Built target srcpackage exit code: 0 ... good, lets continue exit code: 0 ... good, lets continue error: Failed build dependencies: libzypp-devel >= 6.21.4 is needed by zypper-1.2.10-0.src ( ) ( ) ( ) _ ) ( \_ _(_\ \)__ (____\___)) build failed stopping dbus.. Shutting down D-Bus daemon..done ... unmounting sys ... unmounting proc ... unmounting pts umount: /data/hudson/HUDSON-CHROOT/zypp-head-x86_64/dev/pts: not mounted Can't unmount devpts /data/hudson/HUDSON-CHROOT/zypp-head-x86_64/dev/pts Archiving artifacts -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 2

[zypp-commit] <zypper> master : changes
by Michael Andres 06 Nov '09

06 Nov '09

ref: refs/heads/master commit 8eb9ec7403c12a8ae7d8cd18b6458cefe3644502 Author: Michael Andres <ma(a)suse.de> Date: Fri Nov 6 19:49:26 2009 +0100 changes --- package/zypper.changes | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/package/zypper.changes b/package/zypper.changes index d22367e..12280c2 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Nov 6 19:47:49 CET 2009 - ma(a)suse.de + +- Fix zypper to use up-to-date RepoInfos. (bnc #544432) + +------------------------------------------------------------------- Fri Nov 6 15:35:46 CET 2009 - jkupec(a)suse.cz - fixed wrong package counting during installation (bnc #545295) -- 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 : Fix zypper to use up-to-date RepoInfos. (bnc #544432)
by Michael Andres 06 Nov '09

06 Nov '09

ref: refs/heads/master commit 3951fa524e52a9a890ed06ce9df69aa8027caaa2 Author: Michael Andres <ma(a)suse.de> Date: Fri Nov 6 19:49:17 2009 +0100 Fix zypper to use up-to-date RepoInfos. (bnc #544432) --- src/Zypper.h | 5 +++++ src/repos.cc | 1 + 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/Zypper.h b/src/Zypper.h index ad37aef..c6b7d36 100644 --- a/src/Zypper.h +++ b/src/Zypper.h @@ -87,6 +87,11 @@ struct GlobalOptions bool changedRoot; }; +/** + * \bug The RepoInfo lists kept herein may lack housekeeping data added by the + * zypp::RepoManager. Consider using your own RepoInfos only for those not + * maintained by zypp::RepoManager. (bnc #544432) +*/ struct RuntimeData { RuntimeData() diff --git a/src/repos.cc b/src/repos.cc index f02aaa1..7c285fe 100644 --- a/src/repos.cc +++ b/src/repos.cc @@ -1359,6 +1359,7 @@ void add_repo(Zypper & zypper, RepoInfo & repo) struct Bye { ~Bye() { Zypper::instance()->runtimeData().current_repo = RepoInfo(); } } reset __attribute__ ((__unused__)); manager.addRepository(repo); + repo = manager.getRepo(repo); } catch (const RepoAlreadyExistsException & e) { -- 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.22.0
by Michael Andres 06 Nov '09

06 Nov '09

ref: refs/heads/master commit 8a0a6d39e7f1b2b4f5bc7a5cb7cea6ebde0b1822 Author: Michael Andres <ma(a)suse.de> Date: Fri Nov 6 22:18:17 2009 +0100 changes 6.22.0 --- VERSION.cmake | 6 +++--- package/libzypp.changes | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index f436b05..2d1d467 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "19") -SET(LIBZYPP_MINOR "21") -SET(LIBZYPP_PATCH "4") +SET(LIBZYPP_MINOR "22") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 6.21.4 (19) +# LAST RELEASED: 6.22.0 (19) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index dd271d0..32a28e8 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Nov 6 22:16:10 CET 2009 - ma(a)suse.de + +- dup: Process drop list only if product actually changes. (bnc #552180) +- Selectable: Consider allowed arch/noarch changes when comuting candiadates. +- version 6.22.0 (19) + +------------------------------------------------------------------- Mon Nov 2 21:33:40 CET 2009 - ma(a)suse.de - Enhance interface for zypper. (bnc #551956) -- 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 : Selectable: Consider allowed arch/noarch changes when comuting candiadates.
by Michael Andres 06 Nov '09

06 Nov '09

ref: refs/heads/master commit d3654a7b5cb9b3921e07e213a8b30ae11a271f0f Author: Michael Andres <ma(a)suse.de> Date: Fri Nov 6 22:15:27 2009 +0100 Selectable: Consider allowed arch/noarch changes when comuting candiadates. --- tests/data/TCSelectable/RepoHIGH.xml | 39 ++++++++++++++++++++- tests/data/TCSelectable/RepoMID.xml | 37 ++++++++++++++++++++ tests/data/TCSelectable/solver-system.xml | 9 +++++ tests/zypp/Selectable_test.cc | 27 ++++++++++++++- zypp/ui/SelectableImpl.h | 53 +++++++++++++++++++++++------ zypp/ui/SelectableTraits.h | 39 ++++++++++++--------- 6 files changed, 175 insertions(+), 29 deletions(-) diff --git a/tests/data/TCSelectable/RepoHIGH.xml b/tests/data/TCSelectable/RepoHIGH.xml index 6cfccd6..924fff9 100644 --- a/tests/data/TCSelectable/RepoHIGH.xml +++ b/tests/data/TCSelectable/RepoHIGH.xml @@ -10,11 +10,48 @@ </package> <package> <name>candidate</name> - <vendor>unkown</vendor> + <vendor>unknown</vendor> + <history><update> + <arch>i586</arch> + <version>4</version> + <release>1</release> + </update></history> +</package> + +<package> + <name>candidatenoarch</name> + <vendor>unknown</vendor> + <history><update> + <arch>noarch</arch> + <version>5</version> + <release>1</release> + </update></history> +</package> +<package> + <name>candidatenoarch</name> + <vendor>unknown</vendor> + <history><update> + <arch>x86_64</arch> + <version>4</version> + <release>1</release> + </update></history> +</package> +<package> + <name>candidatenoarch</name> + <vendor>unknown</vendor> <history><update> <arch>i586</arch> <version>4</version> <release>1</release> </update></history> </package> +<package> + <name>candidatenoarch</name> + <vendor>unknown</vendor> + <history><update> + <arch>noarch</arch> + <version>4</version> + <release>1</release> + </update></history> +</package> </subchannel></channel> diff --git a/tests/data/TCSelectable/RepoMID.xml b/tests/data/TCSelectable/RepoMID.xml index f1b6d1d..3537414 100644 --- a/tests/data/TCSelectable/RepoMID.xml +++ b/tests/data/TCSelectable/RepoMID.xml @@ -17,4 +17,41 @@ <release>1</release> </update></history> </package> + +<package> + <name>candidatenoarch</name> + <vendor>openSUSE</vendor> + <history><update> + <arch>noarch</arch> + <version>0</version> + <release>2</release> + </update></history> +</package> +<package> + <name>candidatenoarch</name> + <vendor>openSUSE</vendor> + <history><update> + <arch>x86_64</arch> + <version>0</version> + <release>1</release> + </update></history> +</package> +<package> + <name>candidatenoarch</name> + <vendor>openSUSE</vendor> + <history><update> + <arch>i586</arch> + <version>0</version> + <release>1</release> + </update></history> +</package> +<package> + <name>candidatenoarch</name> + <vendor>openSUSE</vendor> + <history><update> + <arch>noarch</arch> + <version>0</version> + <release>1</release> + </update></history> +</package> </subchannel></channel> diff --git a/tests/data/TCSelectable/solver-system.xml b/tests/data/TCSelectable/solver-system.xml index 4fe7341..7e1a908 100644 --- a/tests/data/TCSelectable/solver-system.xml +++ b/tests/data/TCSelectable/solver-system.xml @@ -8,4 +8,13 @@ <release>1</release> </update></history> </package> +<package> + <name>candidatenoarch</name> + <vendor>unknown</vendor> + <history><update> + <arch>i586</arch> + <version>1</version> + <release>1</release> + </update></history> +</package> </subchannel></channel> diff --git a/tests/zypp/Selectable_test.cc b/tests/zypp/Selectable_test.cc index a878f42..8d49f80 100644 --- a/tests/zypp/Selectable_test.cc +++ b/tests/zypp/Selectable_test.cc @@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE(candiadate) // U__s_(2)candidate-4-1.x86_64(RepoHIGH)(unkown) // U__s_(3)candidate-4-1.i586(RepoHIGH)(unkown) // U__s_(6)candidate-0-1.x86_64(RepoMID)(SUSE) - // U__s_(7)candidate-0-1.i586(RepoMID)(SUSE) <- candidate (highrst prio matching arch and vendor) + // U__s_(7)candidate-0-1.i586(RepoMID)(SUSE) <- candidate (highest prio matching arch and vendor) // U__s_(4)candidate-2-1.x86_64(RepoLOW)(openSUSE) // U__s_(5)candidate-2-1.i586(RepoLOW)(openSUSE) // } @@ -39,3 +39,28 @@ BOOST_AUTO_TEST_CASE(candiadate) // no updateCandidate due to low version BOOST_CHECK_EQUAL( s->updateCandidateObj(), PoolItem() ); } + +BOOST_AUTO_TEST_CASE(candiadatenoarch) +{ + ResPoolProxy poolProxy( test.poolProxy() ); + ui::Selectable::Ptr s( poolProxy.lookup( ResKind::package, "candidatenoarch" ) ); +/*[package]candidatenoarch: S_KeepInstalled + (I 1) { + I__s_(17)candidatenoarch-1-1.i586(@System) +} (A 8) { + C U__s_(4)candidatenoarch-5-1.noarch(RepoHIGH) <- candidate (arch/noarch change) + U__s_(5)candidatenoarch-4-1.x86_64(RepoHIGH) + U__s_(6)candidatenoarch-4-1.i586(RepoHIGH) + U__s_(7)candidatenoarch-4-1.noarch(RepoHIGH) + U__s_(12)candidatenoarch-0-2.noarch(RepoMID) + U__s_(13)candidatenoarch-0-1.x86_64(RepoMID) + U__s_(14)candidatenoarch-0-1.i586(RepoMID) + U__s_(15)candidatenoarch-0-1.noarch(RepoMID) +} */ + std::cout << dump(s) << endl; + BOOST_CHECK_EQUAL( s->candidateObj()->repoInfo().alias(), "RepoHIGH" ); + BOOST_CHECK_EQUAL( s->candidateObj()->edition(), Edition("5-1") ); + BOOST_CHECK_EQUAL( s->candidateObj()->arch(), Arch_noarch ); + // no updateCandidate due to low version + BOOST_CHECK_EQUAL( s->updateCandidateObj(), s->candidateObj() ); +} diff --git a/zypp/ui/SelectableImpl.h b/zypp/ui/SelectableImpl.h index 7d211b4..86f1ecc 100644 --- a/zypp/ui/SelectableImpl.h +++ b/zypp/ui/SelectableImpl.h @@ -154,8 +154,9 @@ namespace zypp || VendorAttr::instance().equivalent( _defaultCandidate->vendor(), installed->vendor() ) ) ) return PoolItem(); - // check arch change - if ( _defaultCandidate->arch() != installed->arch() ) + // check arch change (arch noarch changes are allowed) + if ( _defaultCandidate->arch() != installed->arch() + && ! ( _defaultCandidate->arch() == Arch_noarch || installed->arch() == Arch_noarch ) ) return PoolItem(); // check greater edition @@ -280,11 +281,12 @@ 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 + 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() ) + // 'same arch' includes allowed changes to/from noarch. + if ( (*iit)->arch() == (*it)->arch() || (*iit)->arch() == Arch_noarch || (*it)->arch() == Arch_noarch ) { if ( ! solver_allowVendorChange ) { @@ -345,14 +347,43 @@ namespace zypp inline std::ostream & dumpOn( std::ostream & str, const Selectable::Impl & obj ) { str << '[' << obj.kind() << ']' << obj.name() << ": " << obj.status() << endl; - if ( obj.candidateObj() ) - str << "(C " << obj.candidateObj() << ")" << endl; - else - str << "(C NONE )" << endl; - dumpRange( str << " (I " << obj.installedSize() << ") ", obj.installedBegin(), obj.installedEnd() ); + if ( obj.installedEmpty() ) - str << endl << " "; - dumpRange( str << " (A " << obj.availableSize() << ") ", obj.availableBegin(), obj.availableEnd() ) << endl; + str << " (I 0) {}" << endl << " "; + else + { + str << " (I " << obj.installedSize() << ") {" << endl; + for_( it, obj.installedBegin(), obj.installedEnd() ) + { + str << " " << *it << endl; + } + str << "} "; + } + + if ( obj.availableEmpty() ) + { + str << "(A 0) {}"; + } + else + { + PoolItem cand( obj.candidateObj() ); + PoolItem up( obj.updateCandidateObj() ); + str << "(A " << obj.availableSize() << ") {" << endl; + for_( it, obj.availableBegin(), obj.availableEnd() ) + { + char t = ' '; + if ( *it == cand ) + { + t = *it == up ? 'C' : 'c'; + } + else if ( *it == up ) + { + t = 'u'; + } + str << " " << t << " " << *it << endl; + } + str << "} "; + } return str; } diff --git a/zypp/ui/SelectableTraits.h b/zypp/ui/SelectableTraits.h index b994bf7..298994f 100644 --- a/zypp/ui/SelectableTraits.h +++ b/zypp/ui/SelectableTraits.h @@ -34,7 +34,7 @@ namespace zypp { /** Oder on AvailableItemSet. * \li repository priority - * \li best Arch + * \li best Arch (arch/noarch changes are ok) * \li best Edition * \li ResObject::constPtr as fallback. */ @@ -47,21 +47,30 @@ namespace zypp // bool operator()( const PoolItem & lhs, const PoolItem & rhs ) const { - unsigned lprio = lhs->satSolvable().repository().info().priority(); - unsigned rprio = rhs->satSolvable().repository().info().priority(); + int lprio = lhs->satSolvable().repository().satInternalPriority(); + int rprio = rhs->satSolvable().repository().satInternalPriority(); if ( lprio != rprio ) - return( lprio < rprio ); // lower value meands higher priority :( - int res = lhs->arch().compare( rhs->arch() ); - if ( res ) - return res > 0; - res = lhs->edition().compare( rhs->edition() ); + return( lprio > rprio ); + + // arch/noarch changes are ok. + if ( lhs->arch() != Arch_noarch && rhs->arch() != Arch_noarch ) + { + int res = lhs->arch().compare( rhs->arch() ); + if ( res ) + return res > 0; + } + + int res = lhs->edition().compare( rhs->edition() ); if ( res ) return res > 0; - // no more criteria, still equal: - // use the ResObject::constPtr (the poiner value) - // (here it's arbitrary whether < or > ) - return lhs.resolvable() < rhs.resolvable(); + lprio = lhs->satSolvable().repository().satInternalSubPriority(); + rprio = rhs->satSolvable().repository().satInternalSubPriority(); + if ( lprio != rprio ) + return( lprio > rprio ); + + // no more criteria, still equal: sort by id + return lhs.satSolvable().id() < rhs.satSolvable().id(); } }; @@ -90,10 +99,8 @@ namespace zypp if ( ldate != rdate ) return( ldate > rdate ); - // no more criteria, still equal: - // use the ResObject::constPtr (the poiner value) - // (here it's arbitrary whether < or > ) - return lhs.resolvable() < rhs.resolvable(); + // no more criteria, still equal: sort by id + return lhs.satSolvable().id() < rhs.satSolvable().id(); } }; -- 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 : Add tool/DumpSelectable
by Michael Andres 06 Nov '09

06 Nov '09

ref: refs/heads/master commit 6eaa9e9466b0233524c3027e810548a5b5b96da2 Author: Michael Andres <ma(a)suse.de> Date: Fri Nov 6 21:52:14 2009 +0100 Add tool/DumpSelectable --- tools/DumpSelectable.cc | 138 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 138 insertions(+), 0 deletions(-) diff --git a/tools/DumpSelectable.cc b/tools/DumpSelectable.cc new file mode 100644 index 0000000..60b2402 --- /dev/null +++ b/tools/DumpSelectable.cc @@ -0,0 +1,138 @@ +#define INCLUDE_TESTSETUP_WITHOUT_BOOST +#include "zypp/../tests/lib/TestSetup.h" +#undef INCLUDE_TESTSETUP_WITHOUT_BOOST + +#include <algorithm> +#include <zypp/PoolQuery.h> + +static std::string appname( "DumpSelectable" ); + +#define message cout +using std::flush; + +int errexit( const std::string & msg_r = std::string(), int exit_r = 100 ) +{ + if ( ! msg_r.empty() ) + { + cerr << endl << msg_r << endl << endl; + } + return exit_r; +} + +int usage( const std::string & msg_r = std::string(), int exit_r = 100 ) +{ + if ( ! msg_r.empty() ) + { + cerr << endl << msg_r << endl << endl; + } + cerr << "Usage: " << appname << " [--root ROOTDIR] [OPTIONS] NAME..." << endl; + cerr << " Load all enabled repositories (no refresh) and search for" << endl; + cerr << " Selectables names NAME" << endl; + cerr << " --root Load repos from the system located below ROOTDIR. If ROOTDIR" << endl; + cerr << " denotes a sover testcase, the testcase is loaded." << endl; + cerr << "" << endl; + return exit_r; +} + +/****************************************************************** +** +** FUNCTION NAME : main +** FUNCTION TYPE : int +*/ +int main( int argc, char * argv[] ) +{ + INT << "===[START]==========================================" << endl; + appname = Pathname::basename( argv[0] ); + --argc,++argv; + + if ( ! argc ) + { + return usage(); + } + + /////////////////////////////////////////////////////////////////// + + ZConfig::instance(); + Pathname sysRoot("/"); + sat::Pool satpool( sat::Pool::instance() ); + + if ( (*argv) == std::string("--root") ) + { + --argc,++argv; + if ( ! argc ) + return errexit("--root requires an argument."); + + if ( ! PathInfo( *argv ).isDir() ) + return errexit("--root requires a directory."); + + sysRoot = *argv; + --argc,++argv; + } + + if ( TestSetup::isTestcase( sysRoot ) ) + { + message << str::form( "*** Load Testcase from '%s'", sysRoot.c_str() ) << endl; + TestSetup test; + test.loadTestcaseRepos( sysRoot ); + } + else if ( TestSetup::isTestSetup( sysRoot ) ) + { + message << str::form( "*** Load TestSetup from '%s'", sysRoot.c_str() ) << endl; + TestSetup test( sysRoot, Arch_x86_64 ); + test.loadRepos(); + } + else + { + // a system + message << str::form( "*** Load system at '%s'", sysRoot.c_str() ) << endl; + if ( true ) + { + message << "*** load target '" << Repository::systemRepoAlias() << "'\t" << endl; + getZYpp()->initializeTarget( sysRoot ); + getZYpp()->target()->load(); + message << satpool.systemRepo() << endl; + } + + if ( true ) + { + RepoManager repoManager( sysRoot ); + RepoInfoList repos = repoManager.knownRepositories(); + for_( it, repos.begin(), repos.end() ) + { + RepoInfo & nrepo( *it ); + + if ( ! nrepo.enabled() ) + continue; + + if ( ! repoManager.isCached( nrepo ) ) + { + message << str::form( "*** omit uncached repo '%s' (do 'zypper refresh')", nrepo.name().c_str() ) << endl; + continue; + } + + message << str::form( "*** load repo '%s'\t", nrepo.name().c_str() ) << flush; + try + { + repoManager.loadFromCache( nrepo ); + message << satpool.reposFind( nrepo.alias() ) << endl; + } + catch ( const Exception & exp ) + { + message << exp.asString() + "\n" + exp.historyAsString() << endl; + message << str::form( "*** omit broken repo '%s' (do 'zypper refresh')", nrepo.name().c_str() ) << endl; + continue; + } + } + } + } + + /////////////////////////////////////////////////////////////////// + + for ( ; argc; --argc,++argv ) + { + message << dump( ui::Selectable::get( IdString( *argv ) ) ) << endl; + } + + INT << "===[END]============================================" << endl << endl; + return 0; +} -- 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 : Repository: expose satsolvers priority values.
by Michael Andres 06 Nov '09

06 Nov '09

ref: refs/heads/master commit b55117367a2e49a16704d7df381fb4728da3b920 Author: Michael Andres <ma(a)suse.de> Date: Fri Nov 6 21:51:47 2009 +0100 Repository: expose satsolvers priority values. --- zypp/Repository.cc | 14 ++++++++++++++ zypp/Repository.h | 11 +++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/zypp/Repository.cc b/zypp/Repository.cc index d7c7f53..d67ff82 100644 --- a/zypp/Repository.cc +++ b/zypp/Repository.cc @@ -9,6 +9,7 @@ /** \file zypp/sat/Repository.cc * */ +#include <climits> #include <iostream> #include "zypp/base/Logger.h" @@ -63,6 +64,19 @@ namespace zypp std::string Repository::name() const { return info().name(); } + int Repository::satInternalPriority() const + { + NO_REPOSITORY_RETURN( INT_MIN ); + return _repo->priority; + } + + int Repository::satInternalSubPriority() const + { + NO_REPOSITORY_RETURN( INT_MIN ); + return _repo->subpriority; + } + + zypp::Date Repository::generatedTimestamp() const { NO_REPOSITORY_RETURN( 0 ); diff --git a/zypp/Repository.h b/zypp/Repository.h index 5976c8e..229bc49 100644 --- a/zypp/Repository.h +++ b/zypp/Repository.h @@ -262,6 +262,17 @@ namespace zypp ::_Repo * get() const; /** Expert backdoor. */ IdType id() const { return _id; } + /** satsolver internal priorities. + * Unlike the \ref RepoInfo priority which tries to be YUM conform + * (H[1-99]L), this one is the solvers internal priority representation. + * It is type \c int and as one might expect it, the higher the value + * the higher the priority. Subpriority is currently used to express + * media preferences (\see \ref MediaPriority). + */ + //{@ + int satInternalPriority() const; + int satInternalSubPriority() const; + //*} private: #ifndef SWIG // Swig treats it as syntax error friend base::SafeBool<Repository>::operator bool_type() const; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0