Author: mlandres Date: Mon Oct 13 12:33:35 2008 New Revision: 11312 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11312&view=rev Log: - Fix package-manager script to properly quote arguments. (bnc #30903,#420046) - Follow solver policy and make repository priority the highest key, when ordering packages. Then architecture, and edition last. Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-11_0-Branch/libzypp/tools/package-manager/package-manager branches/SuSE-Linux-11_0-Branch/libzypp/zypp/ui/SelectableTraits.h Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake?rev=11312&r1=11311&r2=11312&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Mon Oct 13 12:33:35 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "27") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes?rev=11312&r1=11311&r2=11312&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Mon Oct 13 12:33:35 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Mon Oct 13 12:31:52 CEST 2008 - ma@suse.de + +- Fix package-manager script to properly quote arguments. + (bnc #30903,#420046) +- Follow solver policy and make repository priority the highest + key, when ordering packages. Then architecture, and edition last. +- revision 11312 +- version 4.27.2 + +------------------------------------------------------------------- Fri Aug 8 14:11:03 CEST 2008 - ma@suse.de - Don't pass epoch to 'rpm -e', it does not support it. Modified: branches/SuSE-Linux-11_0-Branch/libzypp/tools/package-manager/package-manager URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/tools/package-manager/package-manager?rev=11312&r1=11311&r2=11312&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/tools/package-manager/package-manager (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/tools/package-manager/package-manager Mon Oct 13 12:33:35 2008 @@ -12,6 +12,15 @@ exit $1 } +# quoted concatenation of arguments +function mkCmd() { + printf "%q" "$1" + shift + for ARG in "$@"; do + printf " %q" "$ARG" + done +} + HAVE_ZLM=false if rpm -q zen-updater >/dev/null; then HAVE_ZLM=true @@ -22,7 +31,7 @@ fi if $HAVE_ZLM; then - if $HAVE_OPENSUSE; then + if $HAVE_OPENSUSE; then if [ -f /etc/sysconfig/sw_management ]; then . /etc/sysconfig/sw_management PSMS="$PREFERRED_SW_MANAGER_STACK" @@ -51,7 +60,7 @@ xsu() { # a copy of xdg-su. - package-manager-su -c "$*" + package-manager-su -c "$(mkCmd "$@")" } # do_* fall back to yast for STACK=ugh Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/ui/SelectableTraits.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/zypp/ui/SelectableTraits.h?rev=11312&r1=11311&r2=11312&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/ui/SelectableTraits.h (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/ui/SelectableTraits.h Mon Oct 13 12:33:35 2008 @@ -33,6 +33,7 @@ struct SelectableTraits { /** Oder on AvalableItemSet. + * \li repository priority * \li best Arch * \li best Edition * \li ResObject::constPtr as fallback. @@ -46,6 +47,10 @@ // bool operator()( const PoolItem & lhs, const PoolItem & rhs ) const { + unsigned lprio = lhs->satSolvable().repository().info().priority(); + unsigned rprio = rhs->satSolvable().repository().info().priority(); + if ( lprio != rprio ) + return( lprio < rprio ); // lower value meands higher priority :( int res = lhs->arch().compare( rhs->arch() ); if ( res ) return res > 0; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org