Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at Wed Mar 2 12:38:27 CET 2011.
-------- --- libzypp/libzypp.changes 2011-02-14 15:03:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2011-02-16 15:51:57.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 16 14:24:27 UTC 2011 - [email protected] + +- Do not look for $releasever 's value if there is no variable + in the url: parses product file again and again +- version 8.12.2 (10) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libzypp-8.12.1.tar.bz2 New: ---- libzypp-8.12.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.EsgzQZ/_old 2011-03-02 12:37:45.000000000 +0100 +++ /var/tmp/diff_new_pack.EsgzQZ/_new 2011-03-02 12:37:45.000000000 +0100 @@ -23,7 +23,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 8.12.1 +Version: 8.12.2 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ libzypp-8.12.1.tar.bz2 -> libzypp-8.12.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.12.1/VERSION.cmake new/libzypp-8.12.2/VERSION.cmake --- old/libzypp-8.12.1/VERSION.cmake 2011-02-14 14:47:32.000000000 +0100 +++ new/libzypp-8.12.2/VERSION.cmake 2011-03-02 10:44:01.000000000 +0100 @@ -61,7 +61,7 @@ SET(LIBZYPP_MAJOR "8") SET(LIBZYPP_COMPATMINOR "10") SET(LIBZYPP_MINOR "12") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") # # LAST RELEASED: 8.12.1 (10) # (The number in parenthesis is LIBZYPP_COMPATMINOR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.12.1/package/libzypp.changes new/libzypp-8.12.2/package/libzypp.changes --- old/libzypp-8.12.1/package/libzypp.changes 2011-02-14 14:47:32.000000000 +0100 +++ new/libzypp-8.12.2/package/libzypp.changes 2011-03-02 10:44:01.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 16 14:24:27 UTC 2011 - [email protected] + +- Do not look for $releasever 's value if there is no variable + in the url: parses product file again and again +- version 8.12.2 (10) + +------------------------------------------------------------------- Thu Feb 10 16:01:46 CET 2011 - [email protected] - Remove package-manager.desktop file (bnc#329635) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.12.1/tests/parser/RepoindexFileReader_test.cc new/libzypp-8.12.2/tests/parser/RepoindexFileReader_test.cc --- old/libzypp-8.12.1/tests/parser/RepoindexFileReader_test.cc 2011-02-14 14:47:32.000000000 +0100 +++ new/libzypp-8.12.2/tests/parser/RepoindexFileReader_test.cc 2011-03-02 10:44:01.000000000 +0100 @@ -46,6 +46,10 @@ BOOST_CHECK_EQUAL("company-foo", repo.alias()); BOOST_CHECK_EQUAL("sle-11-i386", repo.targetDistribution()); BOOST_CHECK_EQUAL(20, repo.priority()); + // "Repository is per default disabled" + BOOST_CHECK(!repo.enabled()); + // "Repository autorefresh is per default enabled" + BOOST_CHECK(repo.autorefresh()); BOOST_CHECK_EQUAL("/repo/products/foo", repo.path()); collector.repos.pop_front( ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.12.1/zypp/DownloadMode.cc new/libzypp-8.12.2/zypp/DownloadMode.cc --- old/libzypp-8.12.1/zypp/DownloadMode.cc 2011-02-14 14:47:33.000000000 +0100 +++ new/libzypp-8.12.2/zypp/DownloadMode.cc 2011-03-02 10:44:01.000000000 +0100 @@ -36,6 +36,7 @@ switch ( obj ) { #define OUTS(VAL) case VAL: return str << #VAL; break + OUTS( DownloadDefault ); OUTS( DownloadOnly ); OUTS( DownloadInAdvance ); OUTS( DownloadInHeaps ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.12.1/zypp/PluginFrame.cc new/libzypp-8.12.2/zypp/PluginFrame.cc --- old/libzypp-8.12.1/zypp/PluginFrame.cc 2011-02-14 14:47:33.000000000 +0100 +++ new/libzypp-8.12.2/zypp/PluginFrame.cc 2011-03-02 10:44:01.000000000 +0100 @@ -290,8 +290,8 @@ bool operator==( const PluginFrame & lhs, const PluginFrame & rhs ) { - return lhs._pimpl == rhs._pimpl - || lhs.command() == rhs.command() && lhs.headerList() == rhs.headerList() && lhs.body() == rhs.body(); + return ( lhs._pimpl == rhs._pimpl ) + || (( lhs.command() == rhs.command() ) && ( lhs.headerList() == rhs.headerList() ) && ( lhs.body() == rhs.body() )); } ///////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.12.1/zypp/parser/RepoindexFileReader.cc new/libzypp-8.12.2/zypp/parser/RepoindexFileReader.cc --- old/libzypp-8.12.1/zypp/parser/RepoindexFileReader.cc 2011-02-14 14:47:33.000000000 +0100 +++ new/libzypp-8.12.2/zypp/parser/RepoindexFileReader.cc 2011-03-02 10:44:01.000000000 +0100 @@ -109,6 +109,9 @@ // enabled attribute is set info.setEnabled(false); + // Set some defaults that are not contained in the repo information + info.setAutorefresh( true ); + // url and/or path string url_s; s = reader_r->getAttribute("url"); @@ -164,9 +167,6 @@ DBG << info << endl; - // Set some defaults that are not contained in the repo information - info.setAutorefresh( true ); - // ignore the rest _callback(info); return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-8.12.1/zypp/repo/RepoVariables.cc new/libzypp-8.12.2/zypp/repo/RepoVariables.cc --- old/libzypp-8.12.1/zypp/repo/RepoVariables.cc 2011-02-14 14:47:33.000000000 +0100 +++ new/libzypp-8.12.2/zypp/repo/RepoVariables.cc 2011-03-02 10:44:01.000000000 +0100 @@ -56,10 +56,12 @@ newvalue = str::gsub( newvalue, "$basearch", basearch.asString() ); // $releasever (Target::distributionVersion assumes root=/ if target not initialized) - if( releasever.empty() ) - releasever = Target::distributionVersion(Pathname()/*guess*/); + if ( newvalue.find("$releasever") != string::npos ) { + if( releasever.empty() ) + releasever = Target::distributionVersion(Pathname()/*guess*/); - newvalue = str::gsub( newvalue, "$releasever", releasever ); + newvalue = str::gsub( newvalue, "$releasever", releasever ); + } return newvalue; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
