Author: mlandres Date: Thu Sep 6 14:21:20 2007 New Revision: 7125 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7125&view=rev Log: changes Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/Parse.cc trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7125&r1=7124&r2=7125&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Thu Sep 6 14:21:20 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "3") SET(LIBZYPP_MINOR "22") SET(LIBZYPP_COMPATMINOR "21") -SET(LIBZYPP_PATCH "3") +SET(LIBZYPP_PATCH "4") Modified: trunk/libzypp/devel/devel.ma/Parse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?rev=7125&r1=7124&r2=7125&view=diff ============================================================================== --- trunk/libzypp/devel/devel.ma/Parse.cc (original) +++ trunk/libzypp/devel/devel.ma/Parse.cc Thu Sep 6 14:21:20 2007 @@ -54,8 +54,8 @@ { //handle( asKind<Package>( obj_r ) ); //handle( asKind<Patch>( obj_r ) ); - //handle( asKind<Pattern>( obj_r ) ); - //handle( asKind<Product>( obj_r ) ); + handle( asKind<Pattern>( obj_r ) ); + handle( asKind<Product>( obj_r ) ); return true; } @@ -71,11 +71,6 @@ { if ( !p ) return; - - ui::PatchContents pc( p ); - MIL << p << endl; - dumpRange( DBG << pc.size() << endl, - pc.begin(), pc.end() ); } void handle( const Pattern_constPtr & p ) @@ -83,7 +78,10 @@ if ( !p ) return; - MIL << p << endl; + if ( p->vendor().empty() ) + ERR << p << endl; + else if ( p->vendor() == "SUSE (assumed)" ) + SEC << p << endl; } void handle( const Product_constPtr & p ) @@ -91,8 +89,9 @@ if ( !p ) return; - ERR << p << endl; - ERR << p->type() << endl; + USR << p << endl; + USR << p->vendor() << endl; + USR << p->type() << endl; } template<class _C> @@ -329,6 +328,11 @@ { ///////////////////////////////////////////////////////////////// + void Vtst( const std::string & lhs, const std::string & rhs ) + { + (VendorAttr::instance().equivalent( lhs, rhs )?MIL:ERR) << lhs << " <==> "<< rhs << endl; + + } ///////////////////////////////////////////////////////////////// } // namespace zypp @@ -347,12 +351,23 @@ INT << "===[START]==========================================" << endl; setenv( "ZYPP_CONF", "/Local/ROOT/zypp.conf", 1 ); - std::string t( "ABCD" ); - MIL << str::toLower(t.substr(0,3)) << endl; - MIL << str::toLower(t.substr(0,4)) << endl; - MIL << str::toLower(t.substr(0,5)) << endl; - throw; - + Vtst( "", "" ); + Vtst( "", "a" ); + Vtst( "", "suse lkgjhdl" ); + Vtst( "", "opensuse" ); + Vtst( "a", "" ); + Vtst( "a", "a" ); + Vtst( "a", "suse lkgjhdl" ); + Vtst( "a", "opensuse" ); + Vtst( "suse", "" ); + Vtst( "suse", "a" ); + Vtst( "suse", "suse lkgjhdl" ); + Vtst( "suse", "opensuse" ); + Vtst( "opensuse fdhgdd", "" ); + Vtst( "opensuse fdhgdd", "a" ); + Vtst( "opensuse fdhgdd", "suse lkgjhdl" ); + Vtst( "opensuse fdhgdd", "opensuse" ); + throw; DigestReceive foo; KeyRingSignalsReceive baa; @@ -419,20 +434,12 @@ { { zypp::base::LogControl::TmpLineWriter shutUp; - getZYpp()->initTarget( sysRoot ); + //getZYpp()->initTarget( sysRoot ); + getZYpp()->initTarget( "/" ); } MIL << "Added target: " << pool << endl; } - INT << getZYpp()->diskUsage() << endl; - - { - Measure x("SHUTDOWN"); - getZYpp()->removeResolvables( getZYpp()->target()->resolvables() ); - getZYpp()->target()->reset(); - } - - std::for_each( pool.begin(), pool.end(), Xprint() ); /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=7125&r1=7124&r2=7125&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Thu Sep 6 14:21:20 2007 @@ -1,8 +1,15 @@ ------------------------------------------------------------------- +Thu Sep 6 14:11:58 CEST 2007 - ma@suse.de + +- Work arround installed patterns providing an empty vendor string. (#307743) +- Let the solver treat vendor suse and opensuse as equivalent. +- version 3.22.4 + +------------------------------------------------------------------- Thu Sep 6 12:33:27 CEST 2007 - schubi@suse.de - Checking item before evaluating the concerning vendor. bug #307941 -- r 7119 +- r 7119 ------------------------------------------------------------------- Wed Sep 6 02:24:37 CEST 2007 - dmacvicar@suse.de @@ -19,7 +26,7 @@ problems. - improved error message if a requiremnt is not fulfilled Bug 307743 - Add "ignore" option to the solution if a requirement is not fulfilled - Bug 304276 + Bug 304276 - revision 7113 ------------------------------------------------------------------- @@ -35,7 +42,7 @@ Tue Sep 4 12:09:10 CEST 2007 - schubi@suse.de - comparing vendor with VendorAttr::equivalent -- revision 7103 +- revision 7103 ------------------------------------------------------------------- Mon Sep 3 18:43:51 CEST 2007 - schwab@suse.de -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org