Author: mlandres Date: Sat Apr 19 01:09:40 2008 New Revision: 9725 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9725&view=rev Log: per default abort if package installation fails Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/devel/devel.ma/NewPool.cc trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=9725&r1=9724&r2=9725&view=diff ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Sat Apr 19 01:09:40 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "13") SET(LIBZYPP_COMPATMINOR "13") -SET(LIBZYPP_PATCH "2") +SET(LIBZYPP_PATCH "3") Modified: trunk/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.cc?rev=9725&r1=9724&r2=9725&view=diff ============================================================================== --- trunk/libzypp/devel/devel.ma/NewPool.cc (original) +++ trunk/libzypp/devel/devel.ma/NewPool.cc Sat Apr 19 01:09:40 2008 @@ -516,22 +516,6 @@ { } -void tt() -{ - WAR << "+++TTT" << endl; - getZYpp()->pool(); - WAR << "+ TTT" << endl; - for (zypp::ResPool::repository_iterator it = - getZYpp()->pool().knownRepositoriesBegin() - ; it != getZYpp()->pool().knownRepositoriesEnd() - ; ++it) - { - WAR << it->info().alias() << endl; - } - WAR << "---TTT" << endl; -} - - /****************************************************************** ** ** FUNCTION NAME : main @@ -543,9 +527,8 @@ ++argv; zypp::base::LogControl::instance().logToStdErr(); INT << "===[START]==========================================" << endl; - //ZConfig::instance().setTextLocale(Locale("de")); -tt(); -tt(); + ZConfig::instance().setTextLocale(Locale("de")); + ResPool pool( ResPool::instance() ); USR << "pool: " << pool << endl; sat::Pool satpool( sat::Pool::instance() ); @@ -608,7 +591,7 @@ } } - if ( 0 ) + if ( 1 ) { Measure x( "INIT TARGET" ); { @@ -630,42 +613,22 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - for (zypp::ResPool::repository_iterator it = - getZYpp()->pool().knownRepositoriesBegin() - ; it != getZYpp()->pool().knownRepositoriesEnd() - ; ++it) - { - MIL << it->info().alias() << endl; - } - - /////////////////////////////////////////////////////////////////// - INT << "===[END]============================================" << endl << endl; - zypp::base::LogControl::instance().logNothing(); - return 0; - //vdumpPoolStats( USR << "Pool:"<< endl, pool.begin(), pool.end() ) << endl; - if ( !pool.empty() ) { - std::string name( pool.begin()->resolvable()->name() ); - PoolItem pi ( getPi<Package>( name ) ); + PoolItem pi ( getPi<Package>( "aspell" ) ); MIL << pi << endl; if ( pi ) { pi.status().setTransact( true, ResStatus::USER ); - //solve(); + solve(); vdumpPoolStats( USR << "Transacting:"<< endl, make_filter_beginresfilter::ByTransact(pool), make_filter_endresfilter::ByTransact(pool) ) << endl; install(); - - pi = getPi<Package>( name ); - if ( pi ) - { - INT << "Still here? " << getPi<Package>("ant") << endl; - return 1; - } } + } + /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; zypp::base::LogControl::instance().logNothing(); @@ -708,7 +671,6 @@ vdumpPoolStats( USR << "Transacting:"<< endl, make_filter_beginresfilter::ByTransact(pool), make_filter_endresfilter::ByTransact(pool) ) << endl; - } } Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=9725&r1=9724&r2=9725&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Sat Apr 19 01:09:40 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sat Apr 19 01:08:04 CEST 2008 - ma@suse.de + +- per default abort if package installation fails. (bnc #381203) +- version 4.13.3 +- revision 9725 + +------------------------------------------------------------------- Fri Apr 18 15:19:36 CEST 2008 - dmacvicar@suse.de - add ZYpp and curl version to http agent string Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.cc?rev=9725&r1=9724&r2=9725&view=diff ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Sat Apr 19 01:09:40 2008 @@ -115,6 +115,7 @@ // path: directory where to look // name,version,release: Script name must match 'name-version.release-' prefix // +#warning nedds to be reimplemented excetion safe void RunUpdateScript(Pathname path, std::string name, std::string version, std::string release) { // open the scripts directory @@ -623,7 +624,9 @@ // else WAR << "Install failed" << endl; remaining.push_back( *it ); + progress.disconnect(); success = false; + break; } if ( success && !policy_r.dryRun() ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org