Author: lslezak Date: Wed Jun 18 15:37:08 2008 New Revision: 48394 URL: http://svn.opensuse.org/viewcvs/yast?rev=48394&view=rev Log: - ask user when uninstalling a package via command line option (bnc#399795) Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/sw_single.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.changes?rev=48394&r1=48393&r2=48394&view=diff ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Jun 18 15:37:08 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 18 15:35:31 CEST 2008 - lslezak@suse.cz + +- ask user when uninstalling a package via command line option + (bnc#399795) + +------------------------------------------------------------------- Tue Jun 17 15:08:53 CEST 2008 - lslezak@suse.cz - use Pkg::SourceSaveAll() instead of Pkg::SourceFinishAll() Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.ycp?rev=48394&r1=48393&r2=48394&view=diff ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Wed Jun 18 15:37:08 2008 @@ -524,13 +524,25 @@ } }); + // confirm removal by user (bnc#399795) + if (action == `remove) + { + map opts = $[ "dialog_type" : `summaryMode, "repo_mgmt" : true ]; + y2milestone("Using packager widget options: %1", opts); + + result = (symbol)WFM::CallFunction( "inst_packages", [opts]); + + if (result != `accept) + return `abort; + } + if (Pkg::PkgSolve (false)) // Solve dependencies { result = `next; // go-on if no conflicts } else { - result = (symbol)WFM::CallFunction( "inst_packages", []); // Ask user if conflicts + result = (symbol)WFM::CallFunction( "inst_packages", [ $["repo_mgmt" : true] ]); // Ask user if conflicts y2milestone ("inst_packages returns %1", result); if (result == `accept) result = `next; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org