Author: mlandres Date: Fri Oct 31 18:10:59 2008 New Revision: 11565 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11565&view=rev Log: backup Modified: trunk/libzypp/devel/devel.ma/TransList.cc trunk/libzypp/zypp/parser/ProductFileReader.cc Modified: trunk/libzypp/devel/devel.ma/TransList.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/TransList.cc?rev=11565&r1=11564&r2=11565&view=diff ============================================================================== --- trunk/libzypp/devel/devel.ma/TransList.cc (original) +++ trunk/libzypp/devel/devel.ma/TransList.cc Fri Oct 31 18:10:59 2008 @@ -196,15 +196,11 @@ { Measure x( "PARSE" ); - parser::ProductFileData val; std::vectorparser::ProductFileData result; - - parser::ProductFileReader::scanDir( functor::getFirst( val ), - //functor::getAll( std::back_inserter( result ) ), + parser::ProductFileReader::scanDir( functor::getAll( std::back_inserter( result ) ), sysRoot / "etc/products.d" ); - USR << val << endl; - USR << result << endl; + MIL << "Products: " << result << endl; } #if 0 Modified: trunk/libzypp/zypp/parser/ProductFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ProductFileReader.cc?rev=11565&r1=11564&r2=11565&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/ProductFileReader.cc (original) +++ trunk/libzypp/zypp/parser/ProductFileReader.cc Fri Oct 31 18:10:59 2008 @@ -101,12 +101,17 @@ obj.edition().c_str(), obj.arch().c_str(), obj.vendor().c_str() ); + if ( ! obj.upgrades().empty() ) + { + for_( it, obj.upgrades().begin(), obj.upgrades().end() ) + str << endl << " " << *it; + } return str; } std::ostream & operator<<( std::ostream & str, const ProductFileData::Upgrade & obj ) { - str << str::form( " |upgrade|%s|", + str << str::form( "|upgrade|%s|", obj.name().c_str() ); return str; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org