Mailinglist Archive: yast-commit (595 mails)

[locilka@xxxxxxxxxxxxxxxx]

Author: locilka
Date: Tue Dec 16 14:37:50 2008
New Revision: 54175

URL: http://svn.opensuse.org/viewcvs/yast?rev=54175&view=rev
Log:
- Preventing from showing add-on added by Community Repositories
  twice (bnc #450274).


Modified:
    trunk/add-on/package/yast2-add-on.changes
    trunk/add-on/src/add-on-workflow.ycp

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=54175&r1=54174&r2=54175&view=diff
==============================================================================
--- trunk/add-on/package/yast2-add-on.changes (original)
+++ trunk/add-on/package/yast2-add-on.changes Tue Dec 16 14:37:50 2008
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Dec 16 14:33:23 CET 2008 - locilka@xxxxxxx
+
+- Preventing from showing add-on added by Community Repositories
+  twice (bnc #450274).
+
+-------------------------------------------------------------------
 Fri Dec 12 15:35:36 CET 2008 - locilka@xxxxxxx
 
 - Fixed appearance of buttons and their handling (e.g.,

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=54175&r1=54174&r2=54175&view=diff
==============================================================================
--- trunk/add-on/src/add-on-workflow.ycp (original)
+++ trunk/add-on/src/add-on-workflow.ycp Tue Dec 16 14:37:50 2008
@@ -117,6 +117,17 @@
        return;
     }
 
+    // BNC #450274
+    // Prevent from adding one product twice
+    list <map> matching_products = filter (map one_product, 
AddOnProduct::add_on_products, {
+       return (one_product["media"]:-1 == src_id);
+    });
+
+    if (size (matching_products) > 0) {
+       y2milestone ("Product already added: %1", matching_products);
+       return;
+    }
+
     map source_data = Pkg::SourceGeneralData (src_id);
 
     AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[
@@ -807,6 +818,8 @@
 To add a new product, click <b>Add</b>. To remove an already added one,
 select it and click <b>Delete</b>.</p>");
 
+    y2milestone ("Current products: %1", AddOnProduct::add_on_products);
+
     integer index = -1;
     list items = maplist (map<string,any> product, 
AddOnProduct::add_on_products, {
        index = index + 1;

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx