Mailinglist Archive: yast-commit (518 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Wed Apr 22 08:16:30 2009
New Revision: 56903

URL: http://svn.opensuse.org/viewcvs/yast?rev=56903&view=rev
Log:
- look primary into base product for isolinux.cfg (bnc#496263)
- 2.18.4 


Modified:
    trunk/product-creator/VERSION
    trunk/product-creator/package/yast2-product-creator.changes
    trunk/product-creator/src/ProductCreator.ycp

Modified: trunk/product-creator/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=56903&r1=56902&r2=56903&view=diff
==============================================================================
--- trunk/product-creator/VERSION (original)
+++ trunk/product-creator/VERSION Wed Apr 22 08:16:30 2009
@@ -1 +1 @@
-2.18.3
+2.18.4

Modified: trunk/product-creator/package/yast2-product-creator.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=56903&r1=56902&r2=56903&view=diff
==============================================================================
--- trunk/product-creator/package/yast2-product-creator.changes (original)
+++ trunk/product-creator/package/yast2-product-creator.changes Wed Apr 22 
08:16:30 2009
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Apr 22 08:03:46 CEST 2009 - jsuchome@xxxxxxx
+
+- look primary into base product for isolinux.cfg (bnc#496263)
+- 2.18.4 
+
+-------------------------------------------------------------------
 Tue Apr 14 15:40:03 CEST 2009 - jsuchome@xxxxxxx
 
 - Image Creator: install squashfs by default (bnc#485052)

Modified: trunk/product-creator/src/ProductCreator.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreator.ycp?rev=56903&r1=56902&r2=56903&view=diff
==============================================================================
--- trunk/product-creator/src/ProductCreator.ycp (original)
+++ trunk/product-creator/src/ProductCreator.ycp Wed Apr 22 08:16:30 2009
@@ -695,13 +695,18 @@
        if (arch == "s390_64") arch = "s390x";
        bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", arch);
 
-       list<integer> srcids = [checkProductDependency()];
+
+       list<integer> srcids    = [];
+       if (Config["base_repo"]:"" == "")
+           srcids = [checkProductDependency()];
+       else
+           srcids      = UrlToId ([Config["base_repo"]:""]);
 
        foreach(integer srcid, srcids,
            {
                y2milestone("Downloading %1 from source %2", bootconfig_path, 
srcid);
                bootconfig_path = Pkg::SourceProvideOptionalFile(srcids[0]:0, 
1, bootconfig_path);
-               y2debug("bootconfig_path: %1", bootconfig_path);
+               y2debug ("bootconfig_path: %1", bootconfig_path);
 
                if (bootconfig_path == nil)
                {

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