Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at Tue Oct 27 16:54:15 CET 2009. -------- --- zypper/zypper.changes 2009-10-21 18:42:28.000000000 +0200 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2009-10-23 16:35:50.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Oct 23 15:09:58 CEST 2009 - ma@suse.de + +- Fix 'dup --from' not to perform a complete distupgrade. (bnc #549490) +- Require at least libzypp version used at buildtime. (bnc #549205) +- 1.2.7 + +------------------------------------------------------------------- +Fri Oct 23 12:50:35 CEST 2009 - jkupec@suse.cz + +- Fixed unintentional hiding of the 'p' install summary option + (bnc #549183) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zypper-1.2.6.tar.bz2 New: ---- zypper-1.2.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.EJYQ72/_old 2009-10-27 16:53:43.000000000 +0100 +++ /var/tmp/diff_new_pack.EJYQ72/_new 2009-10-27 16:53:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package zypper (Version 1.2.6) +# spec file for package zypper (Version 1.2.7) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,6 +23,7 @@ BuildRequires: augeas-devel >= 0.5.0 readline-devel >= 5.1 BuildRequires: cmake >= 2.4.6 gcc-c++ >= 4.1 Requires: procps +%requires_ge libzypp Recommends: logrotate cron License: GPL v2 or later Group: System/Packages @@ -30,7 +31,7 @@ AutoReqProv: on PreReq: permissions Summary: Command line software manager using libzypp -Version: 1.2.6 +Version: 1.2.7 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc @@ -117,4 +118,5 @@ # declare ownership of the log file but prevent # it from being erased by rpm -e %ghost %config(noreplace) %{_var}/log/zypper.log + %changelog ++++++ zypper-1.2.6.tar.bz2 -> zypper-1.2.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/VERSION.cmake new/zypper-1.2.7/VERSION.cmake --- old/zypper-1.2.6/VERSION.cmake 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/VERSION.cmake 2009-10-27 13:30:40.000000000 +0100 @@ -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 +# LAST RELEASED: 1.2.7 #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/package/zypper.changes new/zypper-1.2.7/package/zypper.changes --- old/zypper-1.2.6/package/zypper.changes 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/package/zypper.changes 2009-10-27 13:30:40.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Oct 23 15:09:58 CEST 2009 - ma@suse.de + +- Fix 'dup --from' not to perform a complete distupgrade. (bnc #549490) +- Require at least libzypp version used at buildtime. (bnc #549205) +- 1.2.7 + +------------------------------------------------------------------- +Fri Oct 23 12:50:35 CEST 2009 - jkupec@suse.cz + +- Fixed unintentional hiding of the 'p' install summary option + (bnc #549183) + +------------------------------------------------------------------- Wed Oct 21 17:49:07 CEST 2009 - ma@suse.de - Fix abort on 'zypper lu -a'. (bnc #548752) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/cs.po new/zypper-1.2.7/po/cs.po --- old/zypper-1.2.6/po/cs.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/cs.po 2009-10-27 13:30:40.000000000 +0100 @@ -708,11 +708,11 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "Zámek %lu byl úspěšně odstraněn." -msgstr[1] "Zámky %lu byly úspěšně odstraněny." -msgstr[2] "Zámky %lu byly úspěšně odstraněny." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "Zámek %zu byl úspěšně odstraněn." +msgstr[1] "Zámky %zu byly úspěšně odstraněny." +msgstr[2] "Zámky %zu byly úspěšně odstraněny." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/da.po new/zypper-1.2.7/po/da.po --- old/zypper-1.2.6/po/da.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/da.po 2009-10-27 13:30:40.000000000 +0100 @@ -710,10 +710,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu lås er blevet fjernet." -msgstr[1] "%lu låse er blevet fjernet." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu lås er blevet fjernet." +msgstr[1] "%zu låse er blevet fjernet." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/de.po new/zypper-1.2.7/po/de.po --- old/zypper-1.2.6/po/de.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/de.po 2009-10-27 13:30:40.000000000 +0100 @@ -708,10 +708,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu Sperre wurde erfolgreich entfernt." -msgstr[1] "%lu Sperren wurden erfolgreich entfernt." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu Sperre wurde erfolgreich entfernt." +msgstr[1] "%zu Sperren wurden erfolgreich entfernt." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/en_GB.po new/zypper-1.2.7/po/en_GB.po --- old/zypper-1.2.6/po/en_GB.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/en_GB.po 2009-10-27 13:30:40.000000000 +0100 @@ -669,8 +669,8 @@ #: ../src/locks.cc:232 #, fuzzy, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." msgstr[0] "Repository %s has been successfully modified." msgstr[1] "Repository %s has been successfully modified." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/en_US.po new/zypper-1.2.7/po/en_US.po --- old/zypper-1.2.6/po/en_US.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/en_US.po 2009-10-27 13:30:40.000000000 +0100 @@ -643,8 +643,8 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." msgstr[0] "" msgstr[1] "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/es.po new/zypper-1.2.7/po/es.po --- old/zypper-1.2.6/po/es.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/es.po 2009-10-27 13:30:40.000000000 +0100 @@ -716,10 +716,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu bloqueo fue eliminado satisfactoriamente." -msgstr[1] "%lu bloqueos fueron eliminados satisfactoriamente." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu bloqueo fue eliminado satisfactoriamente." +msgstr[1] "%zu bloqueos fueron eliminados satisfactoriamente." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/fi.po new/zypper-1.2.7/po/fi.po --- old/zypper-1.2.6/po/fi.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/fi.po 2009-10-27 13:30:40.000000000 +0100 @@ -708,10 +708,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "Lukon %lu poistaminen onnistui." -msgstr[1] "%lu lukkoa poistettiin onnistuneesti." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "Lukon %zu poistaminen onnistui." +msgstr[1] "%zu lukkoa poistettiin onnistuneesti." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/fr.po new/zypper-1.2.7/po/fr.po --- old/zypper-1.2.6/po/fr.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/fr.po 2009-10-27 13:30:40.000000000 +0100 @@ -719,10 +719,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "Le verrouillage %lu a été supprimé avec succès." -msgstr[1] "Les verrouillages spécifiés %lu ont été supprimés avec succès." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "Le verrouillage %zu a été supprimé avec succès." +msgstr[1] "Les verrouillages spécifiés %zu ont été supprimés avec succès." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/gl.po new/zypper-1.2.7/po/gl.po --- old/zypper-1.2.6/po/gl.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/gl.po 2009-10-27 13:30:40.000000000 +0100 @@ -704,10 +704,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu bloqueo fue eliminado satisfactoriamente." -msgstr[1] "%lu bloqueos foros eliminados satisfactoriamente." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu bloqueo fue eliminado satisfactoriamente." +msgstr[1] "%zu bloqueos foros eliminados satisfactoriamente." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/hu.po new/zypper-1.2.7/po/hu.po --- old/zypper-1.2.6/po/hu.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/hu.po 2009-10-27 13:30:40.000000000 +0100 @@ -711,10 +711,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "A %lu zárolás feloldása sikeres." -msgstr[1] "A %lu zárolások feloldása sikeres." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "A %zu zárolás feloldása sikeres." +msgstr[1] "A %zu zárolások feloldása sikeres." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/it.po new/zypper-1.2.7/po/it.po --- old/zypper-1.2.6/po/it.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/it.po 2009-10-27 13:30:40.000000000 +0100 @@ -707,10 +707,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "Il blocco %lu è stato rimosso con successo." -msgstr[1] "I blocchi %lu sono stati rimossi con successo." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "Il blocco %zu è stato rimosso con successo." +msgstr[1] "I blocchi %zu sono stati rimossi con successo." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/ja.po new/zypper-1.2.7/po/ja.po --- old/zypper-1.2.6/po/ja.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/ja.po 2009-10-27 13:30:40.000000000 +0100 @@ -700,9 +700,9 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu 個のパッケージロックを解除しました。" +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu 個のパッケージロックを解除しました。" #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/km.po new/zypper-1.2.7/po/km.po --- old/zypper-1.2.6/po/km.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/km.po 2009-10-27 13:30:40.000000000 +0100 @@ -699,9 +699,9 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "សោ %lu ត្រូវ​បានយកចេញ​ដោយ​ស្វ័យ​ប្រវត្តិ ។" +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "សោ %lz ត្រូវ​បានយកចេញ​ដោយ​ស្វ័យ​ប្រវត្តិ ។" #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/ko.po new/zypper-1.2.7/po/ko.po --- old/zypper-1.2.6/po/ko.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/ko.po 2009-10-27 13:30:40.000000000 +0100 @@ -709,9 +709,9 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu 잠금이 성공적으로 제거 되었습니다." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu 잠금이 성공적으로 제거 되었습니다." # progress stages #: ../src/locks.cc:239 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/nb.po new/zypper-1.2.7/po/nb.po --- old/zypper-1.2.6/po/nb.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/nb.po 2009-10-27 13:30:40.000000000 +0100 @@ -700,10 +700,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu lås er fjernet." -msgstr[1] "%lu lås er fjernet." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu lås er fjernet." +msgstr[1] "%zu lås er fjernet." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/nl.po new/zypper-1.2.7/po/nl.po --- old/zypper-1.2.6/po/nl.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/nl.po 2009-10-27 13:30:40.000000000 +0100 @@ -705,10 +705,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu blokkering is met succes verwijderd." -msgstr[1] "%lu blokkeringen zijn met succes verwijderd." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu blokkering is met succes verwijderd." +msgstr[1] "%zu blokkeringen zijn met succes verwijderd." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/pl.po new/zypper-1.2.7/po/pl.po --- old/zypper-1.2.6/po/pl.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/pl.po 2009-10-27 13:30:40.000000000 +0100 @@ -707,11 +707,11 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "Usunięto blokadę %lu." -msgstr[1] "Usunięto blokady %lu." -msgstr[2] "Usunięto blokad %lu." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "Usunięto blokadę %zu." +msgstr[1] "Usunięto blokady %zu." +msgstr[2] "Usunięto blokad %zu." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/pt.po new/zypper-1.2.7/po/pt.po --- old/zypper-1.2.6/po/pt.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/pt.po 2009-10-27 13:30:40.000000000 +0100 @@ -708,10 +708,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "A tranca %lu foi removida com sucesso." -msgstr[1] "As trancas %lu foram removidas com sucesso." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "A tranca %zu foi removida com sucesso." +msgstr[1] "As trancas %zu foram removidas com sucesso." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/pt_BR.po new/zypper-1.2.7/po/pt_BR.po --- old/zypper-1.2.6/po/pt_BR.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/pt_BR.po 2009-10-27 13:30:40.000000000 +0100 @@ -706,10 +706,10 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu trava foi removida com sucesso." -msgstr[1] "%lu travas foram removidas com sucesso." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu trava foi removida com sucesso." +msgstr[1] "%zu travas foram removidas com sucesso." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/ru.po new/zypper-1.2.7/po/ru.po --- old/zypper-1.2.6/po/ru.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/ru.po 2009-10-27 13:30:40.000000000 +0100 @@ -700,11 +700,11 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu блокировка успешно удалена." -msgstr[1] "%lu блокировки успешно удалены." -msgstr[2] "%lu блокировок успешно удалено." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu блокировка успешно удалена." +msgstr[1] "%zu блокировки успешно удалены." +msgstr[2] "%zu блокировок успешно удалено." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/sk.po new/zypper-1.2.7/po/sk.po --- old/zypper-1.2.6/po/sk.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/sk.po 2009-10-27 13:30:40.000000000 +0100 @@ -704,11 +704,11 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "'%lu' zámok bol úspešne odstránený." -msgstr[1] "'%lu' zámky boli úspešne odstránené." -msgstr[2] "'%lu' zámkov bolo úspešne odstránených." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "'%zu' zámok bol úspešne odstránený." +msgstr[1] "'%zu' zámky boli úspešne odstránené." +msgstr[2] "'%zu' zámkov bolo úspešne odstránených." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/th.po new/zypper-1.2.7/po/th.po --- old/zypper-1.2.6/po/th.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/th.po 2009-10-27 13:30:40.000000000 +0100 @@ -708,9 +708,9 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "เอาการล็อค %lu ตัวออกไปแล้ว" +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "เอาการล็อค %zu ตัวออกไปแล้ว" #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/uk.po new/zypper-1.2.7/po/uk.po --- old/zypper-1.2.6/po/uk.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/uk.po 2009-10-27 13:30:40.000000000 +0100 @@ -705,11 +705,11 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu блокування було успішно знято." -msgstr[1] "%lu блокування було успішно знято." -msgstr[2] "%lu блокувань було успішно знято." +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu блокування було успішно знято." +msgstr[1] "%zu блокування було успішно знято." +msgstr[2] "%zu блокувань було успішно знято." #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/zh_CN.po new/zypper-1.2.7/po/zh_CN.po --- old/zypper-1.2.6/po/zh_CN.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/zh_CN.po 2009-10-27 13:30:40.000000000 +0100 @@ -709,9 +709,9 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "成功移除 %lu 锁定。" +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "成功移除 %zu 锁定。" #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/po/zh_TW.po new/zypper-1.2.7/po/zh_TW.po --- old/zypper-1.2.6/po/zh_TW.po 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/po/zh_TW.po 2009-10-27 13:30:40.000000000 +0100 @@ -701,9 +701,9 @@ #: ../src/locks.cc:232 #, c-format -msgid "%lu lock has been successfully removed." -msgid_plural "%lu locks have been succesfully removed." -msgstr[0] "%lu 鎖定已成功移除。" +msgid "%zu lock has been successfully removed." +msgid_plural "%zu locks have been succesfully removed." +msgstr[0] "%zu 鎖定已成功移除。" #: ../src/locks.cc:239 msgid "Problem removing the package lock:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/src/locks.cc new/zypper-1.2.7/src/locks.cc --- old/zypper-1.2.6/src/locks.cc 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/src/locks.cc 2009-10-27 13:30:40.000000000 +0100 @@ -6,7 +6,7 @@ #include "zypp/Locks.h" #include "output/Out.h" -#include "main.h" +#include "main.h" #include "Table.h" #include "utils/misc.h" #include "locks.h" @@ -41,14 +41,14 @@ th << _("Catalog") << _("Importance"); else th << _("Type") << _("Repository"); - + t << th; unsigned i = 1; for_(it, locks.begin(), locks.end()) { TableRow tr; - + // # tr << str::numstring (i); @@ -177,7 +177,7 @@ { advance(it, i-1); locks.removeLock(*it); - + zypper.out().info(_("Specified lock has been successfully removed.")); } else //package name @@ -213,7 +213,7 @@ last = *it; } } - + if (res == 1) //only one with identical name, then remove it locks.removeLock(last); else @@ -229,8 +229,8 @@ //removed something else zypper.out().info(str::form(_PL( - "%lu lock has been successfully removed.", - "%lu locks have been succesfully removed.", + "%zu lock has been successfully removed.", + "%zu locks have been succesfully removed.", start - locks.size()), start - locks.size())); } catch(const Exception & e) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/src/repos.cc new/zypper-1.2.7/src/repos.cc --- old/zypper-1.2.6/src/repos.cc 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/src/repos.cc 2009-10-27 13:30:40.000000000 +0100 @@ -281,13 +281,11 @@ bool match_repo(Zypper & zypper, string str, RepoInfo *repo) { RepoManager & manager = zypper.repoManager(); - list<RepoInfo> known; - known.insert(known.end(), manager.repoBegin(), manager.repoEnd()); bool found = false; - unsigned int number = 1; // repo number - for (list<RepoInfo>::const_iterator known_it = known.begin(); - known_it != known.end(); ++known_it, number++) + + for (RepoManager::RepoConstIterator known_it = manager.repoBegin(); + known_it != manager.repoEnd(); ++known_it, number++) { unsigned int tmp = 0; safe_lexical_cast (str, tmp); // try to make an int out of the string @@ -492,7 +490,7 @@ it->name().c_str(), "no-cd")); gData.repos.erase(it++); } - if (no_remote && MediaAccess::downloads(*it->baseUrlsBegin())) + if (no_remote && (*it->baseUrlsBegin()).schemeIsDownloading()) { zypper.out().info(str::form( _("Ignoring repository '%s' because of '%s' option."), @@ -1652,7 +1650,7 @@ { if (!it->baseUrlsEmpty()) { - if ( !MediaAccess::downloads( *it->baseUrlsBegin()) ) + if ( ! (*it->baseUrlsBegin()).schemeIsDownloading() ) { string alias = it->alias(); toModify.insert( alias ); @@ -1667,7 +1665,7 @@ { if (!it->baseUrlsEmpty()) { - if ( MediaAccess::downloads( *it->baseUrlsBegin()) ) + if ( (*it->baseUrlsBegin()).schemeIsDownloading() ) { string alias = it->alias(); toModify.insert( alias ); @@ -2787,10 +2785,10 @@ if (url.isValid()) { bool modify = false; - if (local && !MediaAccess::downloads( url ) ) + if (local && ! url.schemeIsDownloading() ) modify = true; - if (!modify && remote && MediaAccess::downloads( url ) ) + if (!modify && remote && url.schemeIsDownloading() ) modify = true; if (!modify && schemes.find(url.getScheme()) != schemes.end()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/src/solve-commit.cc new/zypper-1.2.7/src/solve-commit.cc --- old/zypper-1.2.6/src/solve-commit.cc 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/src/solve-commit.cc 2009-10-27 13:30:40.000000000 +0100 @@ -326,7 +326,9 @@ 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 @@ 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; @@ -551,7 +561,7 @@ // 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.6/zypper.spec.cmake new/zypper-1.2.7/zypper.spec.cmake --- old/zypper-1.2.6/zypper.spec.cmake 2009-10-21 18:37:05.000000000 +0200 +++ new/zypper-1.2.7/zypper.spec.cmake 2009-10-27 13:30:40.000000000 +0100 @@ -15,6 +15,7 @@ BuildRequires: readline-devel >= 5.1 augeas-devel >= 0.5.0 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps +%requires_ge libzypp Recommends: logrotate cron License: GPL v2 or later Group: System/Packages @@ -37,7 +38,7 @@ install patches, hardware drivers, verify dependencies, and more. Zypper can be used interactively or non-interactively by user, from scripts, -or front-ends. +or front-ends. Authors: -------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org