Author: mlandres Date: Tue Jun 10 16:03:57 2008 New Revision: 10367 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10367&view=rev Log: Allow to abort commit during package deletion. Modified: branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetCallbackReceiver.cc branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetCallbackReceiver.h branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc Modified: branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc?rev=10367&r1=10366&r2=10367&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/devel/devel.ma/NewPool.cc Tue Jun 10 16:03:57 2008 @@ -560,29 +560,12 @@ /////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// - for_( it, pool.byKindBegin<Package>(), pool.byKindEnd<Package>() ) + for_( it, pool.byKindBegin<Pattern>(), pool.byKindEnd<Pattern>() ) { - it->status().setTransact( true, ResStatus::USER ); + MIL << *it << endl; + //it->status().setTransact( true, ResStatus::USER ); } - SEC << zypp::getZYpp()->diskUsage() << endl; - - - MIL << (*pool.byKindBegin<SrcPackage>())->provides() << endl; - - MIL << (Capability( "srcpackage:foo == 1.0" ).detail()) << endl; - MIL << (Capability( "foo == 1.0", ResKind::srcpackage ).detail()) << endl; - MIL << (Capability( "foo.src == 1.0" ).detail()) << endl; - MIL << (Capability( "foo.i386 == 1.0" ).detail()) << endl; - - MIL << (Capability( "srcpackage:foo == 1.0" )) << endl; - MIL << (Capability( "foo == 1.0", ResKind::srcpackage )) << endl; - MIL << (Capability( "foo.src == 1.0" )) << endl; - MIL << (Capability( "foo.i386 == 1.0" )) << endl; - - SEC << sat::WhatProvides( Capability( "srcpackage:zypper" ) ) << endl;; - SEC << sat::WhatProvides( Capability( "zypper", ResKind::srcpackage ) ) << endl;; - SEC << sat::WhatProvides( Capability( "zypper.src" ) ) << endl;; /////////////////////////////////////////////////////////////////// INT << "===[END]============================================" << endl << endl; Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes?rev=10367&r1=10366&r2=10367&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Tue Jun 10 16:03:57 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 10 15:55:31 CEST 2008 - ma@suse.de + +- Allow to abort commit during package deletion. (bnc #389238) +- revision 10367 + +------------------------------------------------------------------- Fri Jun 6 13:48:23 CEST 2008 - ma@suse.de - Handle application/x-redhat-package-manager in package-manager.desktop Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetCallbackReceiver.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetCallbackReceiver.cc?rev=10367&r1=10366&r2=10367&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetCallbackReceiver.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetCallbackReceiver.cc Tue Jun 10 16:03:57 2008 @@ -105,6 +105,7 @@ RpmRemovePackageReceiver::RpmRemovePackageReceiver (Resolvable::constPtr res) : callback::ReceiveReportrpm::RpmRemoveReport () , _resolvable (res) + , _abort(false) { } @@ -132,7 +133,8 @@ */ bool RpmRemovePackageReceiver::progress( unsigned percent ) { - return _report->progress( percent, _resolvable ); + _abort = ! _report->progress( percent, _resolvable ); + return _abort; } rpm::RpmRemoveReport::Action Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetCallbackReceiver.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetCallbackReceiver.h?rev=10367&r1=10366&r2=10367&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetCallbackReceiver.h (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetCallbackReceiver.h Tue Jun 10 16:03:57 2008 @@ -67,6 +67,8 @@ { callback::SendReport rpm::RemoveResolvableReport _report; Resolvable::constPtr _resolvable; + bool _abort; + public: @@ -86,6 +88,11 @@ */ virtual bool progress( unsigned percent ); + /** + * Returns true if removing is aborted during progress + */ + bool aborted() const { return _abort; } + /** inform user about a problem */ virtual rpm::RpmRemoveReport::Action problem( Exception & excpt_r ); Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc?rev=10367&r1=10366&r2=10367&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/target/TargetImpl.cc Tue Jun 10 16:03:57 2008 @@ -700,6 +700,15 @@ try { rpm().removePackage( p, flags ); + + if ( progress.aborted() ) + { + WAR << "commit aborted by the user" << endl; + progress.disconnect(); + success = false; + abort = true; + break; + } } catch (Exception & excpt_r) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org