Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2012-09-25 10:41:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2012-09-13 00:04:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2012-09-25 10:41:28.000000000 +0200 @@ -1,0 +2,5 @@ +Sun Sep 16 01:14:34 CEST 2012 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-12.2.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.2.0/package/libzypp.changes new/libzypp-12.2.0/package/libzypp.changes --- old/libzypp-12.2.0/package/libzypp.changes 2012-09-12 11:15:22.000000000 +0200 +++ new/libzypp-12.2.0/package/libzypp.changes 2012-09-16 02:10:38.000000000 +0200 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sun Sep 16 01:14:34 CEST 2012 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Wed Sep 12 10:28:00 CEST 2012 - [email protected] - Add str::commonPrefix Files old/libzypp-12.2.0/po/zypp-po.tar.bz2 and new/libzypp-12.2.0/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.2.0/zypp/Patch.cc new/libzypp-12.2.0/zypp/Patch.cc --- old/libzypp-12.2.0/zypp/Patch.cc 2012-09-12 11:15:22.000000000 +0200 +++ new/libzypp-12.2.0/zypp/Patch.cc 2012-09-16 02:10:38.000000000 +0200 @@ -49,29 +49,60 @@ Patch::Category Patch::categoryEnum() const { - static const IdString cat_yast ( "yast" ); - static const IdString cat_security ( "security" ); - static const IdString cat_recommended ( "recommended" ); - static const IdString cat_bugfix ( "bugfix" ); // rhn - static const IdString cat_optional ( "optional" ); - static const IdString cat_feature ( "feature" ); - static const IdString cat_enhancement ( "enhancement" ); // rnh - static const IdString cat_document ( "document" ); - - // patch category is not poolized in the solv file (i.e. an IdString) ;( - IdString cat( sat::LookupAttr( sat::SolvAttr::patchcategory, satSolvable() ).begin().c_str() ); - - if ( cat == cat_yast ) - return CAT_YAST; - if ( cat == cat_security ) - return CAT_SECURITY; - if ( cat == cat_recommended || cat == cat_bugfix ) - return CAT_RECOMMENDED; - if ( cat == cat_optional || cat == cat_enhancement || cat == cat_feature ) - return CAT_OPTIONAL; - if ( cat == cat_document ) - return CAT_DOCUMENT; + std::string cat( category() ); + switch ( cat[0] ) + { + // CAT_YAST + case 'y': + case 'Y': + if ( str::compareCI( cat, "yast" ) == 0 ) + return CAT_YAST; + break; + + // CAT_SECURITY + case 's': + case 'S': + if ( str::compareCI( cat, "security" ) == 0 ) + return CAT_SECURITY; + break; + + // CAT_RECOMMENDED + case 'r': + case 'R': + if ( str::compareCI( cat, "recommended" ) == 0 ) + return CAT_RECOMMENDED; + break; + case 'b': + case 'B': + if ( str::compareCI( cat, "bugfix" ) == 0 ) // rhn + return CAT_RECOMMENDED; + break; + // CAT_OPTIONAL + case 'o': + case 'O': + if ( str::compareCI( cat, "optional" ) == 0 ) + return CAT_OPTIONAL; + break; + case 'f': + case 'F': + if ( str::compareCI( cat, "feature" ) == 0 ) + return CAT_OPTIONAL; + break; + case 'e': + case 'E': + if ( str::compareCI( cat, "enhancement" ) == 0 ) // rhn + return CAT_OPTIONAL; + break; + + // CAT_DOCUMENT + case 'd': + case 'D': + if ( str::compareCI( cat, "document" ) == 0 ) + return CAT_DOCUMENT; + break; + } + // default: return CAT_OTHER; } @@ -220,7 +251,6 @@ continue; } -#warning definition of patch contents is poor - needs review /* find exact providers first (this matches the _real_ 'collection content' of the patch */ providers = sat::WhatProvides( Capability( arch, name.c_str(), Rel::EQ, edition, ResKind::package ) ); if ( providers.empty() ) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
