[yast-commit] r60622 - in /branches/SuSE-Code-11-Branch/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp - YaST Commits

29 Jan 2010

Author: locilka
Date: Fri Jan 29 16:37:30 2010
New Revision: 60622

URL: http://svn.opensuse.org/viewcvs/yast?rev=60622&view=rev
Log:
- Raising a blocker in case of removing any product (except
  migration ones) by solver in proposal (BNC #575117).


Modified:
    branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes
    branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp

Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes?rev=60622&r1=60621&r2=60622&view=diff
==============================================================================

--- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original)
+++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Fri Jan 29 16:37:30 2010
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Fri Jan 29 16:35:00 CET 2010 - locilka@suse.cz
+
+- Raising a blocker in case of removing any product (except
+  migration ones) by solver in proposal (BNC #575117).
+
+-------------------------------------------------------------------
 Thu Jan 28 11:45:12 CET 2010 - locilka@suse.cz
 
 - Updated RPM dependencies (BNC #573482).

Modified: branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp?rev=60622&r1=60621&r2=60622&view=diff
==============================================================================
--- branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp (original)
+++ branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp Fri Jan 29 16:37:30 2010
@@ -308,8 +308,9 @@
 	return sformat (_("%1 (%2)"), display_name, name);
     }
 
-    string GetDistributionUpgradeSummary () {
+    global map  ProposalSummary () {
 	string ret = "";
+	string warning = "";
 
 	list  > products = sort (
 	    map  x, map  y, Pkg::ResolvableProperties ("", `product, ""),
@@ -322,6 +323,7 @@
 
 	string display_name = nil;
 	string name = nil;
+	symbol transact_by = nil;
 
 	// list of all products that will be installed (are selected)
 	list <string> products_to_be_installed = [];
@@ -334,6 +336,8 @@
 	// list of all products that will be upgraded
 	list <string> products_to_be_upgraded = [];
 
+	integer products_removed_by_solver = 0;
+
 	// Products that are going to be removed
 	foreach (map  product, products, {
 	    if (product["status"]:`unknown != `removed) return;
@@ -341,6 +345,7 @@
 	    product = MinimizeProductMap (product);
 	    display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined");
 	    name = product["name"]:_("No short name defined");
+	    transact_by = product["transact_by"]:`unknown;
 
 	    // Removing product and installing the same one (name) means -> upgrade
 	    if (contains (products_to_be_installed, name)) {
@@ -358,12 +363,22 @@
 		    GetDisplayName (display_name, name)
 		) + "</li>\n";
 	    // Removing another product might be an issue
+	    // (nevertheless selected by user or directly by YaST)
+	    } else if (transact_by == `user || transact_by == `app_high) {
+		y2warning ("Product will be removed: %1 (%2)", product, transact_by);
+		ret = ret + "<li>" + sformat (
+		    _("<font color='red'><b>Warning:</b> Product <b>%1</b> will be removed</font>"),
+		    GetDisplayName (display_name, name)
+		) + "</li>\n";
+	    // Not selected by user
+	    // @see BNC #575117
 	    } else {
-		y2warning ("Product will be removed: %1", product);
+		y2warning ("Product will be removed: %1 (%2)", product, transact_by);
 		ret = ret + "<li>" + sformat (
-		    _("<font color='red'>Warning: Product <b>%1</b> will be removed</font>"),
+		    _("<font color='red'><b>Error:</b> Product <b>%1</b> will be automatically removed</font>"),
 		    GetDisplayName (display_name, name)
 		) + "</li>\n";
+		products_removed_by_solver = products_removed_by_solver + 1;
 	    }
 	});
 
@@ -407,19 +422,30 @@
 	    ) + "</li>\n";
 	});
 
-	return "<ul>\n" + ret + "</ul>\n";
-    }
-
-    global map  ProposalSummary () {
-	map  ret = $[];
+	ret = "<ul>\n" + ret + "</ul>\n";
 
-	ret = $[
-	    "preformatted_proposal" : GetDistributionUpgradeSummary(),
+	map  summary = $[
+	    "preformatted_proposal" : ret,
 	    // help text
-	    "help" : _("<p>To change update settings go to <p>Software Proposal</p> section.</p>"),
+	    "help" : _("<p>To change the update settings, go to <p>Packages Proposal</p> section.</p>"),
 	];
 
-	return ret;
+	// Product removal MUST be confirmed by user, otherwise migration will not continue.
+	if (products_removed_by_solver > 0) {
+	    summary["warning_level"] = `blocker;
+	    summary["warning"] = "<ul>" + (
+		products_removed_by_solver > 1 ?
+		sformat(_("<li><b>%1 products are going to be removed.
+Go to packages proposal and solve the issue manually.<br>
+It it also safe to abort the migration now.</b></li>"), products_removed_by_solver)
+		:
+		_("<li><b>One product is going to be removed.
+Go to packages proposal and solve the issue manually.<br>
+It it also safe to abort the migration now.</b></li>")
+	    ) + "</ul>";
+	}
+
+	return summary;
     }
 
     global list  > ReadProductsBeforeMigration () {

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

[yast-commit] r60622 - in /branches/SuSE-Code-11-Branch/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp

locilka＠svn.opensuse.org

tags

participants (1)