Author: lslezak Date: Fri Jul 22 15:49:40 2011 New Revision: 64951 URL: http://svn.opensuse.org/viewcvs/yast?rev=64951&view=rev Log: - properly remove an add-on from installation workflow when it is not compliant (bnc#701497) - 2.17.27 Modified: branches/SuSE-Code-11-SP2-Branch/add-on/VERSION branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp Modified: branches/SuSE-Code-11-SP2-Branch/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/add-on/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/add-on/VERSION Fri Jul 22 15:49:40 2011 @@ -1 +1 @@ -2.17.26 +2.17.27 Modified: branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/add-on/package/yast2-add-on.changes Fri Jul 22 15:49:40 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jul 22 13:28:42 UTC 2011 - lslezak@suse.cz + +- properly remove an add-on from installation workflow when it + is not compliant (bnc#701497) +- 2.17.27 + +------------------------------------------------------------------- Fri Jul 1 11:01:27 UTC 2011 - lslezak@suse.cz - 2.17.26 Modified: branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/add-on... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/add-on/src/add-on-workflow.ycp Fri Jul 22 15:49:40 2011 @@ -1039,6 +1039,22 @@ AddOnProduct::PrepareForRegistration (AddOnProduct::src_id); some_addon_changed = true; } + else if (ret == `abort || ret == `cancel) + { + y2milestone("Add-on sequence aborted"); + + if (AddOnProduct::src_id != nil) + { + y2milestone("Removing add-on repository: %1", AddOnProduct::src_id); + + // remove the repository + Pkg::SourceDelete(AddOnProduct::src_id); + + AddOnProduct::add_on_products = filter(map<string,any> add_on_product, AddOnProduct::add_on_products, + {return add_on_product["media"]:-1 != AddOnProduct::src_id;} + ); + } + } Redraw (enable_back, enable_next, enable_abort, back_button, next_button, abort_button); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org