October 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <libzypp> ma-misc : Add 'identical' test whether two Solvables/PoolItems have the same content.
by Michael Andres 29 Oct '09

29 Oct '09

ref: refs/heads/ma-misc commit 1606b996f1f82bb9d1da6b0fd341c9058305dfe2 Author: Michael Andres <ma(a)suse.de> Date: Thu Oct 29 14:29:47 2009 +0100 Add 'identical' test whether two Solvables/PoolItems have the same content. Basically same name, edition, arch, vendor and buildtime. --- zypp/PoolItem.h | 14 ++++++++++++++ zypp/sat/Solvable.cc | 6 ++++++ zypp/sat/Solvable.h | 10 ++++++++++ 3 files changed, 30 insertions(+), 0 deletions(-) diff --git a/zypp/PoolItem.h b/zypp/PoolItem.h index 1d8c60e..d8854da 100644 --- a/zypp/PoolItem.h +++ b/zypp/PoolItem.h @@ -184,6 +184,20 @@ namespace zypp inline bool operator!=( const ResObject::constPtr & lhs, const PoolItem & rhs ) { return ! (lhs==rhs); } + + /** \relates PoolItem Test for same content. */ + inline bool identical( const PoolItem & lhs, const PoolItem & rhs ) + { return lhs.satSolvable().identical( rhs.satSolvable() ); } + + /** \relates PoolItem Test for same content. */ + inline bool identical( const PoolItem & lhs, sat::Solvable rhs ) + { return lhs.satSolvable().identical( rhs ); } + + /** \relates PoolItem Test for same content. */ + inline bool identical( sat::Solvable lhs, const PoolItem & rhs ) + { return lhs.identical( rhs.satSolvable() ); } + + /** Solvable to PoolItem transform functor. * \relates PoolItem * \relates sat::SolvIterMixin diff --git a/zypp/sat/Solvable.cc b/zypp/sat/Solvable.cc index c7bdaf9..7595687 100644 --- a/zypp/sat/Solvable.cc +++ b/zypp/sat/Solvable.cc @@ -483,6 +483,12 @@ namespace zypp IdString( _solvable->arch ).c_str() ); } + bool Solvable::identical( Solvable rhs ) const + { + NO_SOLVABLE_RETURN( ! rhs.get() ); + ::_Solvable * rhssolvable( rhs.get() ); + return rhssolvable && ::solvable_identical( _solvable, rhssolvable ); + } /////////////////////////////////////////////////////////////////// namespace diff --git a/zypp/sat/Solvable.h b/zypp/sat/Solvable.h index 4a3dda9..8de8d9d 100644 --- a/zypp/sat/Solvable.h +++ b/zypp/sat/Solvable.h @@ -180,6 +180,11 @@ namespace zypp */ std::string asString() const; + /** Test whether two Solvables have the same content. + * Basically the same name, edition, arch, vendor and buildtime. + */ + bool identical( Solvable rhs ) const; + public: /** \name Access to the \ref Solvable dependencies. @@ -291,6 +296,11 @@ namespace zypp inline bool operator<( const Solvable & lhs, const Solvable & rhs ) { return lhs.get() < rhs.get(); } + /** \relates Solvable Test for same content. */ + inline bool identical( Solvable lhs, Solvable rhs ) + { return lhs.identical( rhs ); } + + /////////////////////////////////////////////////////////////////// namespace detail { ///////////////////////////////////////////////////////////////// -- 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: Sort multiple installed items by (Arch, Edition, install time).
by Michael Andres 28 Oct '09

28 Oct '09

ref: refs/heads/master commit d462b0a4b555ae5a6beb13e5ef052a44b011a5ae Author: Michael Andres <ma(a)suse.de> Date: Wed Oct 28 15:27:35 2009 +0100 Selectable: Sort multiple installed items by (Arch, Edition, install time). --- zypp/ui/SelectableTraits.h | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/zypp/ui/SelectableTraits.h b/zypp/ui/SelectableTraits.h index c940289..b994bf7 100644 --- a/zypp/ui/SelectableTraits.h +++ b/zypp/ui/SelectableTraits.h @@ -66,7 +66,10 @@ namespace zypp }; /** Oder on InstalledItemSet. - * Newer install time at the beginning of the set. + * \li best Arch + * \li best Edition + * \li newer install time + * \li ResObject::constPtr as fallback. */ struct IOrder : public std::binary_function<PoolItem,PoolItem,bool> { @@ -76,6 +79,12 @@ namespace zypp // bool operator()( const PoolItem & lhs, const PoolItem & rhs ) const { + int res = lhs->arch().compare( rhs->arch() ); + if ( res ) + return res > 0; + res = lhs->edition().compare( rhs->edition() ); + if ( res ) + return res > 0; Date ldate = lhs->installtime(); Date rdate = rhs->installtime(); if ( ldate != rdate ) -- 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> ma-misc : Selectable: Sort multiple installed items by (Arch, Edition, install time).
by Michael Andres 28 Oct '09

28 Oct '09

ref: refs/heads/ma-misc commit d462b0a4b555ae5a6beb13e5ef052a44b011a5ae Author: Michael Andres <ma(a)suse.de> Date: Wed Oct 28 15:27:35 2009 +0100 Selectable: Sort multiple installed items by (Arch, Edition, install time). --- zypp/ui/SelectableTraits.h | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/zypp/ui/SelectableTraits.h b/zypp/ui/SelectableTraits.h index c940289..b994bf7 100644 --- a/zypp/ui/SelectableTraits.h +++ b/zypp/ui/SelectableTraits.h @@ -66,7 +66,10 @@ namespace zypp }; /** Oder on InstalledItemSet. - * Newer install time at the beginning of the set. + * \li best Arch + * \li best Edition + * \li newer install time + * \li ResObject::constPtr as fallback. */ struct IOrder : public std::binary_function<PoolItem,PoolItem,bool> { @@ -76,6 +79,12 @@ namespace zypp // bool operator()( const PoolItem & lhs, const PoolItem & rhs ) const { + int res = lhs->arch().compare( rhs->arch() ); + if ( res ) + return res > 0; + res = lhs->edition().compare( rhs->edition() ); + if ( res ) + return res > 0; Date ldate = lhs->installtime(); Date rdate = rhs->installtime(); if ( ldate != rdate ) -- 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 : Let match_repo perform a for alias/reponumber and do expensive URL analysis only if needed.
by Michael Andres 28 Oct '09

28 Oct '09

ref: refs/heads/master commit b007b0ff12ac6628aa189e03c55ca66c3d1ff09c Author: Michael Andres <ma(a)suse.de> Date: Wed Oct 28 14:06:06 2009 +0100 Let match_repo perform a for alias/reponumber and do expensive URL analysis only if needed. --- src/repos.cc | 63 +++++++++++++++++++++++++++++++++++----------------------- 1 files changed, 38 insertions(+), 25 deletions(-) diff --git a/src/repos.cc b/src/repos.cc index cf7942f..f02aaa1 100644 --- a/src/repos.cc +++ b/src/repos.cc @@ -281,45 +281,58 @@ static bool build_cache(Zypper & zypper, const RepoInfo &repo, bool force_build) bool match_repo(Zypper & zypper, string str, RepoInfo *repo) { RepoManager & manager = zypper.repoManager(); - bool found = false; - unsigned int number = 1; // repo number - for (RepoManager::RepoConstIterator known_it = manager.repoBegin(); - known_it != manager.repoEnd(); ++known_it, number++) + // Quick check for alias/reponumber first: { - unsigned int tmp = 0; + unsigned int number = 1; // repo number + unsigned int tmp = 0; safe_lexical_cast (str, tmp); // try to make an int out of the string + for (RepoManager::RepoConstIterator known_it = manager.repoBegin(); + known_it != manager.repoEnd(); ++known_it, ++number) + { + if ( known_it->alias() == str || tmp == number ) + { + if (repo) + *repo = *known_it; + return true; + } + } + } + + // Expensive URL analysis only if needed: + bool found = false; + + for (RepoManager::RepoConstIterator known_it = manager.repoBegin(); + known_it != manager.repoEnd(); ++known_it) + { try { - found = known_it->alias() == str || tmp == number; - if (!found) + url::ViewOption urlview = url::ViewOption::DEFAULTS + url::ViewOption::WITH_PASSWORD; + if (zypper.cOpts().count("loose-auth")) { - url::ViewOption urlview = url::ViewOption::DEFAULTS + url::ViewOption::WITH_PASSWORD; - if (zypper.cOpts().count("loose-auth")) - { - urlview = urlview + urlview = urlview - url::ViewOptions::WITH_PASSWORD - url::ViewOptions::WITH_USERNAME; - } - if (zypper.cOpts().count("loose-query")) - urlview = urlview - url::ViewOptions::WITH_QUERY_STR; + } + if (zypper.cOpts().count("loose-query")) + urlview = urlview - url::ViewOptions::WITH_QUERY_STR; - if (!(urlview.has(url::ViewOptions::WITH_PASSWORD) + if (!(urlview.has(url::ViewOptions::WITH_PASSWORD) && urlview.has(url::ViewOptions::WITH_QUERY_STR))) + { + for_(urlit, known_it->baseUrlsBegin(), known_it->baseUrlsEnd()) + if (urlit->asString(urlview) == Url(str).asString(urlview)) { - for_(urlit, known_it->baseUrlsBegin(), known_it->baseUrlsEnd()) - if (urlit->asString(urlview) == Url(str).asString(urlview)) - { - found = true; - break; - } + found = true; + break; } - else - found = - find(known_it->baseUrlsBegin(),known_it->baseUrlsEnd(),Url(str)) - != known_it->baseUrlsEnd(); } + else + found = + find(known_it->baseUrlsBegin(),known_it->baseUrlsEnd(),Url(str)) + != known_it->baseUrlsEnd(); + if (found) { if (repo) -- 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 : Updated iso3166-1 country codes (bnc #531350)
by Michael Andres 28 Oct '09

28 Oct '09

ref: refs/heads/master commit 3187c18a729cf3f922c414167ee195db352414eb Author: Michael Andres <ma(a)suse.de> Date: Wed Oct 28 13:21:03 2009 +0100 Updated iso3166-1 country codes (bnc #531350) --- zypp/CountryCode.cc | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/zypp/CountryCode.cc b/zypp/CountryCode.cc index e3edc25..4151f47 100644 --- a/zypp/CountryCode.cc +++ b/zypp/CountryCode.cc @@ -270,7 +270,6 @@ namespace zypp {"CN", N_( "China" ) }, // :CHN:156: {"CO", N_( "Colombia" ) }, // :COL:170: {"CR", N_( "Costa Rica" ) }, // :CRI:188: - {"CS", N_( "Serbia and Montenegro" ) }, // :SCG:891: {"CU", N_( "Cuba" ) }, // :CUB:192: {"CV", N_( "Cape Verde" ) }, // :CPV:132: {"CX", N_( "Christmas Island" ) }, // :CXR:162: @@ -301,6 +300,7 @@ namespace zypp {"GD", N_( "Grenada" ) }, // :GRD:308: {"GE", N_( "Georgia" ) }, // :GEO:268: {"GF", N_( "French Guiana" ) }, // :GUF:254: + {"GG", N_( "Guernsey" ) }, {"GH", N_( "Ghana" ) }, // :GHA:288: {"GI", N_( "Gibraltar" ) }, // :GIB:292: {"GL", N_( "Greenland" ) }, // :GRL:304: @@ -323,12 +323,14 @@ namespace zypp {"ID", N_( "Indonesia" ) }, // :IDN:360: {"IE", N_( "Ireland" ) }, // :IRL:372: {"IL", N_( "Israel" ) }, // :ISR:376: + {"IM", N_( "Isle of Man" ) }, {"IN", N_( "India" ) }, // :IND:356: {"IO", N_( "British Indian Ocean Territory" ) }, // :IOT:086: {"IQ", N_( "Iraq" ) }, // :IRQ:368: {"IR", N_( "Iran" ) }, // :IRN:364: {"IS", N_( "Iceland" ) }, // :ISL:352: {"IT", N_( "Italy" ) }, // :ITA:380: + {"JE", N_( "Jersey" ) }, {"JM", N_( "Jamaica" ) }, // :JAM:388: {"JO", N_( "Jordan" ) }, // :JOR:400: {"JP", N_( "Japan" ) }, // :JPN:392: @@ -357,6 +359,8 @@ namespace zypp {"MA", N_( "Morocco" ) }, // :MAR:504: {"MC", N_( "Monaco" ) }, // :MCO:492: {"MD", N_( "Moldova" ) }, // :MDA:498: + {"ME", N_( "Montenegro" ) }, + {"MF", N_( "Saint Martin" ) }, {"MG", N_( "Madagascar" ) }, // :MDG:450: {"MH", N_( "Marshall Islands" ) }, // :MHL:584: {"MK", N_( "Macedonia" ) }, // :MKD:807: @@ -405,6 +409,7 @@ namespace zypp {"QA", N_( "Qatar" ) }, // :QAT:634: {"RE", N_( "Reunion" ) }, // :REU:638: {"RO", N_( "Romania" ) }, // :ROU:642: + {"RS", N_( "Serbia" ) }, {"RU", N_( "Russian Federation" ) }, // :RUS:643: {"RW", N_( "Rwanda" ) }, // :RWA:646: {"SA", N_( "Saudi Arabia" ) }, // :SAU:682: -- 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> ma-misc : Updated iso3166-1 country codes (bnc #531350)
by Michael Andres 28 Oct '09

28 Oct '09

ref: refs/heads/ma-misc commit 3187c18a729cf3f922c414167ee195db352414eb Author: Michael Andres <ma(a)suse.de> Date: Wed Oct 28 13:21:03 2009 +0100 Updated iso3166-1 country codes (bnc #531350) --- zypp/CountryCode.cc | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/zypp/CountryCode.cc b/zypp/CountryCode.cc index e3edc25..4151f47 100644 --- a/zypp/CountryCode.cc +++ b/zypp/CountryCode.cc @@ -270,7 +270,6 @@ namespace zypp {"CN", N_( "China" ) }, // :CHN:156: {"CO", N_( "Colombia" ) }, // :COL:170: {"CR", N_( "Costa Rica" ) }, // :CRI:188: - {"CS", N_( "Serbia and Montenegro" ) }, // :SCG:891: {"CU", N_( "Cuba" ) }, // :CUB:192: {"CV", N_( "Cape Verde" ) }, // :CPV:132: {"CX", N_( "Christmas Island" ) }, // :CXR:162: @@ -301,6 +300,7 @@ namespace zypp {"GD", N_( "Grenada" ) }, // :GRD:308: {"GE", N_( "Georgia" ) }, // :GEO:268: {"GF", N_( "French Guiana" ) }, // :GUF:254: + {"GG", N_( "Guernsey" ) }, {"GH", N_( "Ghana" ) }, // :GHA:288: {"GI", N_( "Gibraltar" ) }, // :GIB:292: {"GL", N_( "Greenland" ) }, // :GRL:304: @@ -323,12 +323,14 @@ namespace zypp {"ID", N_( "Indonesia" ) }, // :IDN:360: {"IE", N_( "Ireland" ) }, // :IRL:372: {"IL", N_( "Israel" ) }, // :ISR:376: + {"IM", N_( "Isle of Man" ) }, {"IN", N_( "India" ) }, // :IND:356: {"IO", N_( "British Indian Ocean Territory" ) }, // :IOT:086: {"IQ", N_( "Iraq" ) }, // :IRQ:368: {"IR", N_( "Iran" ) }, // :IRN:364: {"IS", N_( "Iceland" ) }, // :ISL:352: {"IT", N_( "Italy" ) }, // :ITA:380: + {"JE", N_( "Jersey" ) }, {"JM", N_( "Jamaica" ) }, // :JAM:388: {"JO", N_( "Jordan" ) }, // :JOR:400: {"JP", N_( "Japan" ) }, // :JPN:392: @@ -357,6 +359,8 @@ namespace zypp {"MA", N_( "Morocco" ) }, // :MAR:504: {"MC", N_( "Monaco" ) }, // :MCO:492: {"MD", N_( "Moldova" ) }, // :MDA:498: + {"ME", N_( "Montenegro" ) }, + {"MF", N_( "Saint Martin" ) }, {"MG", N_( "Madagascar" ) }, // :MDG:450: {"MH", N_( "Marshall Islands" ) }, // :MHL:584: {"MK", N_( "Macedonia" ) }, // :MKD:807: @@ -405,6 +409,7 @@ namespace zypp {"QA", N_( "Qatar" ) }, // :QAT:634: {"RE", N_( "Reunion" ) }, // :REU:638: {"RO", N_( "Romania" ) }, // :ROU:642: + {"RS", N_( "Serbia" ) }, {"RU", N_( "Russian Federation" ) }, // :RUS:643: {"RW", N_( "Rwanda" ) }, // :RWA:646: {"SA", N_( "Saudi Arabia" ) }, // :SAU:682: -- 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 : update comment
by Michael Andres 27 Oct '09

27 Oct '09

ref: refs/heads/master commit 8546615c4e0bb444a1c015fc52969aec8551dcdb Author: Michael Andres <ma(a)suse.de> Date: Tue Oct 27 16:01:48 2009 +0100 update comment --- src/install.cc | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/install.cc b/src/install.cc index 2cb9482..5452a02 100755 --- a/src/install.cc +++ b/src/install.cc @@ -202,6 +202,20 @@ mark_by_name (Zypper & zypper, // don't try NAME-EDITION yet, could be confused by // dbus-1-x11, java-1_4_2-gcj-compat, ... /* + +ma@: Look at the Capability::guessPackageSpec implementaion. This might be +what you want unless you also want to support globbing like 'libz*-12.3-14'. +In this case you need PoolQuery instead of WhatProvides lookups. + +There is no rule that an edition starts with a number, so your regex approach +won't work. If your string is correctly parsed as a name-capability, you can +check whether it matches a package name. If not, replace the last '-' by a '=', +and check whether the namepart now matches a package (-versionwithoutrelease). +If not, replace the one but last '-' and try again (-version-release). + +That's basically what guessPackageSpec does, but it also supports embeded +arch specs: "libzypp-1.2.3-4.5.arch" or "libzypp.arch-1.2.3-4.5". + bool mark_by_name_edition (...) static const regex rx_name_edition("(.*?)-([0-9].*)"); -- 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> SuSE-SLE-10-SP2-Branch : changes & version
by Ján Kupec 27 Oct '09

27 Oct '09

ref: refs/heads/SuSE-SLE-10-SP2-Branch commit 01cb781371e40c7eac22a7deb913ee1bfcec4a68 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Oct 27 14:33:00 2009 +0100 changes & version --- VERSION | 2 +- package/zypper.changes | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/VERSION b/VERSION index 777a831..3285d2a 100644 --- a/VERSION +++ b/VERSION @@ -10,5 +10,5 @@ dnl phase) dnl ================================================== m4_define([ZYPPER_MAJOR], [0]) m4_define([ZYPPER_MINOR], [6]) -m4_define([ZYPPER_PATCH], [105]) +m4_define([ZYPPER_PATCH], [106]) dnl ================================================== diff --git a/package/zypper.changes b/package/zypper.changes index 98f2232..b52a2d1 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 27 14:32:21 CET 2009 - jkupec(a)suse.cz + +- Init target when refreshing sources, otherwise we dont have the + trusted gpg keys at hand when downloading. (bnc #530389) +- 0.6.106 + +------------------------------------------------------------------- Mon Jul 7 15:31:11 CEST 2008 - jkupec(a)suse.cz - exit in non-interactive mode if given package cannot be found -- 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> SuSE-SLE-10-SP2-Branch : Init target when refreshing sources, as we need trusted gpg keys (bnc #530389)
by Ján Kupec 27 Oct '09

27 Oct '09

ref: refs/heads/SuSE-SLE-10-SP2-Branch commit 1f02349c15a03d25ca49d02e01621b3b5620ff0e Author: Michael Andres <ma(a)suse.de> Date: Fri Oct 9 14:59:48 2009 +0200 Init target when refreshing sources, as we need trusted gpg keys (bnc #530389) --- src/zmart-sources.cc | 35 +++++++++++++++++++++-------------- 1 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/zmart-sources.cc b/src/zmart-sources.cc index 9df66e1..6442968 100644 --- a/src/zmart-sources.cc +++ b/src/zmart-sources.cc @@ -1,5 +1,6 @@ #include "zmart.h" #include "zmart-sources.h" +#include "zmart-misc.h" #include "zypper-tabulator.h" #include "zypper-callbacks.h" @@ -37,10 +38,13 @@ void cond_init_system_sources () init_system_sources(); } done = true; -} +} void init_system_sources() { + // need gpg keys when downloading (#304672) + cond_init_target(); + SourceManager_Ptr manager; manager = SourceManager::sourceManager(); try @@ -57,7 +61,7 @@ void init_system_sources() cerr << _("Failed to restore sources") << endl; exit(-1); } - + for ( SourceManager::Source_const_iterator it = manager->Source_begin(); it != manager->Source_end(); ++it ) { Source_Ref src = manager->findSource(it->alias()); @@ -81,7 +85,7 @@ void include_source_by_url( const Url &url ) ZYPP_CAUGHT( excpt_r ); exit(-1); } - + } #ifdef LIBZYPP_1xx @@ -147,7 +151,7 @@ static void print_source_list(const std::list<SourceInfo> &sources ) void list_system_sources() { std::list<SourceInfo> sources; - + try { #ifdef LIBZYPP_1xx @@ -161,9 +165,9 @@ void list_system_sources() catch ( const Exception &e ) { cout << _("Error reading system sources: ") << e.msg() << std::endl; - exit(-1); + exit(-1); } - + print_source_list(sources); } @@ -200,10 +204,10 @@ bool parse_repo_file (const string& file, string& url, string& alias) if (!have_alias) { cerr << _("Name not found") << endl; - } + } if (!have_url) { cerr << _("baseurl not found") << endl; - } + } cerr_vv << "Name: " << alias << endl; cerr_vv << "URL: " << url << endl; @@ -241,7 +245,7 @@ void add_source_by_url( const zypp::Url &url, const string &alias, Pathname cache; bool is_base = false; string myalias = alias.empty() ? timestamp() : alias; - + // more products? // try cerr_vv << "Creating source" << endl; @@ -261,12 +265,12 @@ void add_source_by_url( const zypp::Url &url, const string &alias, source.enable(); else source.disable(); - + source.setAutorefresh (refresh); sourceIds.push_back( sourceId ); cout << "Added Installation Sources:" << endl; - + list<SourceManager::SourceId>::const_iterator it; for( it = sourceIds.begin(); it != sourceIds.end(); ++it ) { Source_Ref source = manager->findSource(*it); @@ -318,7 +322,7 @@ void remove_source( const std::string& anystring ) { cerr_vv << "Constructing SourceManager" << endl; SourceManager_Ptr manager = SourceManager::sourceManager(); - + cerr_vv << "Restoring SourceManager" << endl; bool success = true; std::set<std::string> _broken_sources; @@ -540,6 +544,9 @@ void refresh_sources() #ifdef LIBZYPP_1xx cerr << _("Sorry, not implemented yet for libzypp-1.x.x") << endl; #else + // need gpg keys when downloading (#304672) + cond_init_target(); + zypp::storage::PersistentStorage store; std::list<SourceInfo> sources; @@ -551,7 +558,7 @@ void refresh_sources() catch ( const Exception &e ) { cerr << _("Error reading system sources: ") << e.msg() << std::endl; - exit(-1); + exit(-1); } for(std::list<SourceInfo>::const_iterator it = sources.begin(); @@ -560,7 +567,7 @@ void refresh_sources() try { cout << _("Refreshing ") << it->alias() << endl << - "URI: " << it->url() << endl; + "URI: " << it->url() << endl; Source_Ref src = SourceFactory().createFrom( it->type(), it->url(), it->path(), it->alias(), it->cacheDir(), false, // base source -- 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 : Adapt translations to changed format specifier.
by Michael Andres 27 Oct '09

27 Oct '09

ref: refs/heads/master commit e711631201b25b7081d439b358d27fe4b204e89a Author: Michael Andres <ma(a)suse.de> Date: Tue Oct 27 13:19:46 2009 +0100 Adapt translations to changed format specifier. --- po/cs.po | 10 +++++----- po/da.po | 8 ++++---- po/de.po | 8 ++++---- po/en_GB.po | 4 ++-- po/en_US.po | 4 ++-- po/es.po | 8 ++++---- po/fi.po | 8 ++++---- po/fr.po | 8 ++++---- po/gl.po | 8 ++++---- po/hu.po | 8 ++++---- po/it.po | 8 ++++---- po/ja.po | 6 +++--- po/km.po | 6 +++--- po/ko.po | 6 +++--- po/nb.po | 8 ++++---- po/nl.po | 8 ++++---- po/pl.po | 10 +++++----- po/pt.po | 8 ++++---- po/pt_BR.po | 8 ++++---- po/ru.po | 10 +++++----- po/sk.po | 10 +++++----- po/th.po | 6 +++--- po/uk.po | 10 +++++----- po/zh_CN.po | 6 +++--- po/zh_TW.po | 6 +++--- 25 files changed, 95 insertions(+), 95 deletions(-) diff --git a/po/cs.po b/po/cs.po index f75777d..f69f68d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -708,11 +708,11 @@ msgstr "Žádný zámek nebyl odstraněn." #: ../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 --git a/po/da.po b/po/da.po index c255621..0b03200 100644 --- a/po/da.po +++ b/po/da.po @@ -710,10 +710,10 @@ msgstr "Ingen lås blev fjernet." #: ../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 --git a/po/de.po b/po/de.po index f25955c..f515720 100644 --- a/po/de.po +++ b/po/de.po @@ -708,10 +708,10 @@ msgstr "Es wurde keine Sperre entfernt." #: ../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 --git a/po/en_GB.po b/po/en_GB.po index 97ce23f..a47cc48 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -669,8 +669,8 @@ msgstr "Repository %s has been removed." #: ../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 --git a/po/en_US.po b/po/en_US.po index c73ffe5..cf19450 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -643,8 +643,8 @@ msgstr "" #: ../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 --git a/po/es.po b/po/es.po index 386ddca..c656572 100644 --- a/po/es.po +++ b/po/es.po @@ -716,10 +716,10 @@ msgstr "No se eliminó ningún bloqueo." #: ../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 --git a/po/fi.po b/po/fi.po index 2a7f9cc..fbc2767 100644 --- a/po/fi.po +++ b/po/fi.po @@ -708,10 +708,10 @@ msgstr "Lukkoja ei poistettu." #: ../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 --git a/po/fr.po b/po/fr.po index af4515a..bb37b86 100644 --- a/po/fr.po +++ b/po/fr.po @@ -719,10 +719,10 @@ msgstr "Auncun verrouillage n'a été supprimé." #: ../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 --git a/po/gl.po b/po/gl.po index 56818fb..52efd1e 100644 --- a/po/gl.po +++ b/po/gl.po @@ -704,10 +704,10 @@ msgstr "Non se eliminou ningún bloqueo." #: ../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 --git a/po/hu.po b/po/hu.po index 9ac3e1a..409aeb8 100644 --- a/po/hu.po +++ b/po/hu.po @@ -711,10 +711,10 @@ msgstr "Nem lett zárolás feloldva." #: ../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 --git a/po/it.po b/po/it.po index f438dfd..aa0b7de 100644 --- a/po/it.po +++ b/po/it.po @@ -707,10 +707,10 @@ msgstr "Nessun blocco è stato rimosso." #: ../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 --git a/po/ja.po b/po/ja.po index 79fbc49..e8acd9d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -700,9 +700,9 @@ msgstr "ロックは解除されませんでした。" #: ../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 --git a/po/km.po b/po/km.po index 3de02c0..a2e68ae 100644 --- a/po/km.po +++ b/po/km.po @@ -699,9 +699,9 @@ msgstr "គ្មានសោត្រូវបានយកច #: ../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 --git a/po/ko.po b/po/ko.po index 6496c7a..8ab29ca 100644 --- a/po/ko.po +++ b/po/ko.po @@ -709,9 +709,9 @@ msgstr "잠금 제거된것이 없습니다." #: ../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 --git a/po/nb.po b/po/nb.po index b670f8b..cbb3846 100644 --- a/po/nb.po +++ b/po/nb.po @@ -700,10 +700,10 @@ msgstr "Ingen lås er fjernet." #: ../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 --git a/po/nl.po b/po/nl.po index 374e67e..cf46fab 100644 --- a/po/nl.po +++ b/po/nl.po @@ -705,10 +705,10 @@ msgstr "Er is geen blokkering verwijderd." #: ../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 --git a/po/pl.po b/po/pl.po index 4921f25..6f79dce 100644 --- a/po/pl.po +++ b/po/pl.po @@ -707,11 +707,11 @@ msgstr "Nie usunięto żadnych blokad." #: ../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 --git a/po/pt.po b/po/pt.po index 71c8951..9d7301e 100644 --- a/po/pt.po +++ b/po/pt.po @@ -708,10 +708,10 @@ msgstr "Nenhuma tranca foi removida." #: ../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 --git a/po/pt_BR.po b/po/pt_BR.po index fa09020..0fc89ca 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -706,10 +706,10 @@ msgstr "Nenhuma trava foi removida." #: ../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 --git a/po/ru.po b/po/ru.po index 0515668..49c7459 100644 --- a/po/ru.po +++ b/po/ru.po @@ -700,11 +700,11 @@ msgstr "Ни одной блокировки не удалено." #: ../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 --git a/po/sk.po b/po/sk.po index bdd64c4..d3dfe90 100644 --- a/po/sk.po +++ b/po/sk.po @@ -704,11 +704,11 @@ msgstr "Nebol odstránené žiadny zámok." #: ../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 --git a/po/th.po b/po/th.po index 9a55ba2..12c71eb 100644 --- a/po/th.po +++ b/po/th.po @@ -708,9 +708,9 @@ msgstr "ไม่มีการล็อคใดที่เอาออกไ #: ../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 --git a/po/uk.po b/po/uk.po index 11a2fb3..2514395 100644 --- a/po/uk.po +++ b/po/uk.po @@ -705,11 +705,11 @@ msgstr "Не було знято жодного блокування." #: ../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 --git a/po/zh_CN.po b/po/zh_CN.po index 240aa90..6e10ffe 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -709,9 +709,9 @@ msgstr "没有删除任何锁定。" #: ../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 --git a/po/zh_TW.po b/po/zh_TW.po index f0197e5..471a048 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -701,9 +701,9 @@ msgstr "沒有鎖定被移除。" #: ../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:" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0