Author: lslezak
Date: Fri Jul 22 16:33:53 2011
New Revision: 64956
URL: http://svn.opensuse.org/viewcvs/yast?rev=64956&view=rev
Log:
- properly remove an add-on from installation workflow when it
is not compliant (bnc#701497)
- 2.21.3
Modified:
trunk/add-on/VERSION
trunk/add-on/package/yast2-add-on.changes
trunk/add-on/src/add-on-workflow.ycp
Modified: trunk/add-on/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=64956&r1=64955&r2=64956&view=diff
==============================================================================
--- trunk/add-on/VERSION (original)
+++ trunk/add-on/VERSION Fri Jul 22 16:33:53 2011
@@ -1 +1 @@
-2.21.2
+2.21.3
Modified: trunk/add-on/package/yast2-add-on.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.changes?rev=64956&r1=64955&r2=64956&view=diff
==============================================================================
--- trunk/add-on/package/yast2-add-on.changes (original)
+++ trunk/add-on/package/yast2-add-on.changes Fri Jul 22 16:33:53 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.21.3
+
+-------------------------------------------------------------------
Wed Jun 29 18:07:46 CEST 2011 - ug@suse.de
- fixed relurl://.... for add-on config in autoyast XML
Modified: trunk/add-on/src/add-on-workflow.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?rev=64956&r1=64955&r2=64956&view=diff
==============================================================================
--- trunk/add-on/src/add-on-workflow.ycp (original)
+++ trunk/add-on/src/add-on-workflow.ycp Fri Jul 22 16:33:53 2011
@@ -1017,6 +1017,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