Mailinglist Archive: yast-commit (1535 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Wed Oct 21 09:07:28 2009
New Revision: 59124

URL: http://svn.opensuse.org/viewcvs/yast?rev=59124&view=rev
Log:
- fixed importing product file (bnc#548637)
- fixed CLI handling of y2update_packages_dir option (bnc#548637)
- 2.18.8


Modified:
    trunk/add-on-creator/VERSION
    trunk/add-on-creator/package/yast2-add-on-creator.changes
    trunk/add-on-creator/src/AddOnCreator.ycp
    trunk/add-on-creator/src/add-on-creator.ycp

Modified: trunk/add-on-creator/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=59124&r1=59123&r2=59124&view=diff
==============================================================================
--- trunk/add-on-creator/VERSION (original)
+++ trunk/add-on-creator/VERSION Wed Oct 21 09:07:28 2009
@@ -1 +1 @@
-2.18.7
+2.18.8

Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add-on-creator.changes?rev=59124&r1=59123&r2=59124&view=diff
==============================================================================
--- trunk/add-on-creator/package/yast2-add-on-creator.changes (original)
+++ trunk/add-on-creator/package/yast2-add-on-creator.changes Wed Oct 21 
09:07:28 2009
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Oct 21 09:03:39 CEST 2009 - jsuchome@xxxxxxx
+
+- fixed importing product file (bnc#548637)
+- fixed CLI handling of y2update_packages_dir option (bnc#548637)
+- 2.18.8
+
+-------------------------------------------------------------------
 Thu Oct  1 16:46:55 CEST 2009 - jsuchome@xxxxxxx
 
 - added more error reporting popups (bnc#542088)

Modified: trunk/add-on-creator/src/AddOnCreator.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.ycp?rev=59124&r1=59123&r2=59124&view=diff
==============================================================================
--- trunk/add-on-creator/src/AddOnCreator.ycp (original)
+++ trunk/add-on-creator/src/AddOnCreator.ycp Wed Oct 21 09:07:28 2009
@@ -825,9 +825,10 @@
     map prod_map       = $[];
     if (size (xml["productdefinition",0,"products"]:[]) > 0)
     {
-       prod_map        = xml["productdefinition",0,"products",0]:$[];
+       prod_map        = 
xml["productdefinition",0,"products",0,"product",0]:$[];
     }
-    prod_map           = xml["product",0]:$[]; // maso, ze?
+    else
+       prod_map        = xml["product",0]:$[]; // maso, ze?
 
     // only simple values are supported here, something nested
     // deeper (e.g. linguas) will not work
@@ -873,6 +874,12 @@
        retmap[key,"value"]     = add (retmap[key,"value"]:[],
            remove (dep, "relationship"));
     });
+    // flavor may be in mediasets section
+    if (!merge_with_current && retmap["flavor","value"]:"" == "")
+    {
+       if (mediamap["flavor"]:"" != "")
+           retmap["flavor","value"]    = mediamap["flavor"]:"";
+    }
     y2milestone ("product_info: %1", retmap);
     return retmap;
 }

Modified: trunk/add-on-creator/src/add-on-creator.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/add-on-creator.ycp?rev=59124&r1=59123&r2=59124&view=diff
==============================================================================
--- trunk/add-on-creator/src/add-on-creator.ycp (original)
+++ trunk/add-on-creator/src/add-on-creator.ycp Wed Oct 21 09:07:28 2009
@@ -320,7 +320,7 @@
     }
     else if (haskey (options, "y2update_packages_dir"))
     {
-       string dir = options["y2update"]:"";
+       string dir = options["y2update_packages_dir"]:"";
        if (FileUtils::Exists (dir))
        {
            map out = (map) SCR::Execute (.target.bash_output,

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