Author: dmacvicar Date: Tue Feb 19 12:02:05 2008 New Revision: 8798 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8798&view=rev Log: - avoid upgrading locked packages (bnc #298022) - 7.1.1.0_2.13 Modified: branches/SuSE-SLE-10-SP2-Branch/backend/VERSION branches/SuSE-SLE-10-SP2-Branch/backend/package/libzypp-zmd-backend.changes branches/SuSE-SLE-10-SP2-Branch/backend/src/locks.cc branches/SuSE-SLE-10-SP2-Branch/backend/src/resolve-dependencies.cc branches/SuSE-SLE-10-SP2-Branch/backend/src/transactions.cc Modified: branches/SuSE-SLE-10-SP2-Branch/backend/VERSION URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/backend/VERSION?rev=8798&r1=8797&r2=8798&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/backend/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/backend/VERSION Tue Feb 19 12:02:05 2008 @@ -1 +1 @@ -m4_define([BACKEND_VERSION], [7.1.1.0_2.12]) +m4_define([BACKEND_VERSION], [7.1.1.0_2.13]) Modified: branches/SuSE-SLE-10-SP2-Branch/backend/package/libzypp-zmd-backend.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/backend/package/libzypp-zmd-backend.changes?rev=8798&r1=8797&r2=8798&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/backend/package/libzypp-zmd-backend.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/backend/package/libzypp-zmd-backend.changes Tue Feb 19 12:02:05 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 19 11:34:33 CET 2008 - dmacvicar@suse.de + +- avoid upgrading locked packages + (bnc #298022) +- 7.1.1.0_2.13 + +------------------------------------------------------------------- Wed Dec 5 11:09:02 CET 2007 - dmacvicar@suse.de - Close db before commit and reopen after Modified: branches/SuSE-SLE-10-SP2-Branch/backend/src/locks.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/backend/src/locks.cc?rev=8798&r1=8797&r2=8798&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/backend/src/locks.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/backend/src/locks.cc Tue Feb 19 12:02:05 2008 @@ -99,11 +99,8 @@ bool operator()( const CapAndItem &cai_r ) { PoolItem_Ref item(cai_r.item); - if ( item.status().isInstalled() ) - { - MIL << "Locking installed " << cai_r.item << "(matched by " << _lock_str << ")" << endl; - item.status().setLock( true, ResStatus::USER); - } + item.status().setLock( true, ResStatus::USER); + MIL << "Locking " << cai_r.item << "(matched by " << _lock_str << ")" << endl; return true; } Modified: branches/SuSE-SLE-10-SP2-Branch/backend/src/resolve-dependencies.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/backend/src/resolve-dependencies.cc?rev=8798&r1=8797&r2=8798&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/backend/src/resolve-dependencies.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/backend/src/resolve-dependencies.cc Tue Feb 19 12:02:05 2008 @@ -121,6 +121,7 @@ MIL << "Processing " << count << " transactions" << endl; God->resolver()->setForceResolve( true ); + MIL << "setForceResolve (true)" << endl; bool success = true; if (argc == 3) { @@ -132,15 +133,21 @@ success = God->resolver()->resolvePool( have_best_package ); } + for (typeof (God->pool().byNameBegin("fake-test-a")) it = God->pool().byNameBegin("fake-test-a"); + it != God->pool().byNameEnd("fake-test-a"); it++) + { + MIL << *it << endl; + } + if (count > 0) { // if we really did something MIL << "Solver " << (success?"was":"NOT") << " successful" << endl; solver::detail::ResolverContext_Ptr context = God->resolver()->context(); - if (context == NULL) { - MIL << "Nothing to transact" << endl; - } - else if (success) { + //if (context == NULL) { + // MIL << "Nothing to transact" << endl; + // } + /*else*/ if (success) { success = write_transactions( God->pool(), db.db(), context ); } else { Modified: branches/SuSE-SLE-10-SP2-Branch/backend/src/transactions.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-SP2-Branch/backend/src/transactions.cc?rev=8798&r1=8797&r2=8798&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/backend/src/transactions.cc (original) +++ branches/SuSE-SLE-10-SP2-Branch/backend/src/transactions.cc Tue Feb 19 12:02:05 2008 @@ -91,7 +91,7 @@ // complain about locked pool item static bool -is_locked( PoolItem_Ref item, PackageOpType action ) +complain_if_locked( PoolItem_Ref item, PackageOpType action ) { char *action_s = ""; switch ( action ) @@ -109,8 +109,8 @@ return true; // don't honor locks on undefined actions } - cerr << "1|" << item_to_string( item ) << " is locked and cannot be " << action_s << endl; - ERR << item << " is locked and cannot be " << action_s << endl; + //cerr << "1|" << item_to_string( item ) << " is locked and cannot be " << action_s << endl; + ERR << item << " is locked and cannot be " << action_s << " (ignoring in transaction)" << endl; return false; } @@ -120,14 +120,12 @@ ResObject::constPtr _obj; PackageOpType _action; PoolItem_Ref affected; - bool locked; // additional requires ResPool::AdditionalCapSet _aCapSet; CopyTransaction( ResObject::constPtr obj, PackageOpType action, ResPool::AdditionalCapSet aCapSet ) : _obj( obj ) , _action( action ) - , locked( false ) , _aCapSet(aCapSet) { } @@ -140,29 +138,32 @@ case PACKAGE_OP_REMOVE: if (check_lock( item )) { - locked = true; - return is_locked( item, _action ); + return complain_if_locked( item, _action ); } - item.status().setToBeUninstalled( ResStatus::USER ); + else + item.status().setToBeUninstalled( ResStatus::APPL_HIGH ); break; case PACKAGE_OP_INSTALL: if (check_lock( item )) { - locked = true; - return is_locked( item, _action ); + return complain_if_locked( item, _action ); } - item.status().setToBeInstalled( ResStatus::USER ); + else + item.status().setToBeInstalled( ResStatus::APPL_HIGH ); break; case PACKAGE_OP_UPGRADE: if (check_lock( item )) { - locked = true; - return is_locked( item, _action ); + return complain_if_locked( item, _action ); } - item.status().setToBeInstalled( ResStatus::USER ); + else + { + item.status().setToBeInstalled( ResStatus::APPL_HIGH ); + } break; case PACKAGE_OP_INSTALL_BEST: pool_install_best( item.resolvable()->kind(), item.resolvable()->name() ); + return true; break; default: ERR << "Ignoring unknown action " << _action << endl; @@ -178,7 +179,7 @@ pool_install_best( const Resolvable::Kind &kind, const std::string &name ) { // The user is setting this capablility - _aCapSet[ResStatus::USER].insert (CapFactory().parse( kind, name)); + _aCapSet[ResStatus::APPL_HIGH].insert (CapFactory().parse( kind, name)); } }; @@ -244,10 +245,12 @@ functor::functorRef (info) ); aCapSet = info._aCapSet; - MIL << "Additional requirements: " << info._aCapSet[ResStatus::USER] << std::endl; + MIL << "Additional requirements (USER): " << info._aCapSet[ResStatus::USER] << std::endl; + MIL << "Additional requirements (APPL_HIGH): " << info._aCapSet[ResStatus::APPL_HIGH] << std::endl; - if (info.locked) - return -1; + // wth is this? + //if (info.locked) + // return -1; if (info.affected) { @@ -317,6 +320,12 @@ bool write_resobject_set( sqlite3_stmt *handle, const PoolItemSet & objects, PackageOpType op_type, ResolverContext_Ptr context) { + if (context == NULL) + { + MIL << "Nothing to transact" << endl; + return true; + } + int rc = SQLITE_DONE; for (PoolItemSet::const_iterator iter = objects.begin(); iter != objects.end(); ++iter) @@ -324,13 +333,21 @@ PoolItem item = *iter; - // only write those items back which were set by solver (#154976) - if (!item.status().isBySolver()) + if ( check_lock(item) ) { - DBG << "Skipping " << item << endl; + cerr << "1|" << item_to_string( item ) << " is locked." << endl; + WAR << "Skipping " << item << " (locked)" << endl; continue; } + + // only write those items back which were set by solver (#154976) + //if (!item.status().isBySolver()) + //{ + // DBG << "Skipping " << item << endl; + // continue; + //} + string details = dep_get_package_info( context, *iter ); sqlite3_bind_int( handle, 1, (int) op_type ); @@ -358,12 +375,25 @@ { MIL << "write_transactions" << endl; + // start a transaction + sqlite3_exec(db, "begin;", NULL, NULL, NULL); + // drop all transactions + sqlite3_exec(db, "delete from transactions;", NULL, NULL, NULL); + + if (context == NULL) + { + MIL << "Nothing to transact" << endl; + sqlite3_exec(db, "commit;", NULL, NULL, NULL); + return true; + } + sqlite3_stmt *handle = NULL; const char *sql = "INSERT INTO transactions (action, id, details) VALUES (?, ?, ?)"; int rc = sqlite3_prepare( db, sql, -1, &handle, NULL ); if (rc != SQLITE_OK) { ERR << "Can not prepare transaction insertion clause: " << sqlite3_errmsg (db) << endl; + sqlite3_exec(db, "rollback;", NULL, NULL, NULL); return false; } PoolItemSet install_set; @@ -393,6 +423,8 @@ sqlite3_finalize( handle ); + // commit the result + sqlite3_exec(db, "commit;", NULL, NULL, NULL); return result; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org