Author: jsuchome
Date: Fri Feb 29 15:59:58 2008
New Revision: 45140
URL: http://svn.opensuse.org/viewcvs/yast?rev=45140&view=rev
Log:
- fixes for bnc#364838:
- save modification of target image type
- set the default value of format attribute for vmx image
- check for kiwi-desc-* packages after selecting image type
- 2.13.31
Modified:
branches/SuSE-SLE-10-SP2-Branch/product-creator/VERSION
branches/SuSE-SLE-10-SP2-Branch/product-creator/package/yast2-product-creator.changes
branches/SuSE-SLE-10-SP2-Branch/product-creator/src/Kiwi.ycp
branches/SuSE-SLE-10-SP2-Branch/product-creator/src/complex.ycp
branches/SuSE-SLE-10-SP2-Branch/product-creator/src/kiwi_dialogs.ycp
Modified: branches/SuSE-SLE-10-SP2-Branch/product-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/product-creator/VERSION?rev=45140&r1=45139&r2=45140&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/product-creator/VERSION (original)
+++ branches/SuSE-SLE-10-SP2-Branch/product-creator/VERSION Fri Feb 29 15:59:58 2008
@@ -1 +1 @@
-2.13.30
+2.13.31
Modified: branches/SuSE-SLE-10-SP2-Branch/product-creator/package/yast2-product-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/product-creator/package/yast2-product-creator.changes?rev=45140&r1=45139&r2=45140&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/product-creator/package/yast2-product-creator.changes (original)
+++ branches/SuSE-SLE-10-SP2-Branch/product-creator/package/yast2-product-creator.changes Fri Feb 29 15:59:58 2008
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Fri Feb 29 15:41:59 CET 2008 - jsuchome@suse.cz
+
+- fixes for bnc#364838:
+- save modification of target image type
+- set the default value of format attribute for vmx image
+- check for kiwi-desc-* packages after selecting image type
+- 2.13.31
+
+-------------------------------------------------------------------
Wed Feb 6 13:33:32 CET 2008 - jsuchome@suse.cz
- save user password when importing configuration (bnc#357922)
Modified: branches/SuSE-SLE-10-SP2-Branch/product-creator/src/Kiwi.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/product-creator/src/Kiwi.ycp?rev=45140&r1=45139&r2=45140&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/product-creator/src/Kiwi.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/product-creator/src/Kiwi.ycp Fri Feb 29 15:59:58 2008
@@ -167,6 +167,7 @@
list<map> get_type_values (map config, string task) {
string boot_image = sformat ("%1boot/%2", task, config[task + "boot"]:"suse-10.2");
+ boolean task_included = false;
list<map> retlist = maplist (
string type, map typemap, (map)config["type"]:$[], {
@@ -184,21 +185,28 @@
ret["flags"] = typemap["flags"]:"";
if (typemap["format"]:"" != "")
ret["format"] = typemap["format"]:"";
+ if (type == "vmx" && ret["format"]:"" == "")
+ ret["format"] = "vmdk";
if (type == task)
+ {
ret["primary"] = "true";
+ task_included = true;
+ }
return ret;
});
- if (retlist == [])
+ if (retlist == [] || !task_included)
{
map ret = $[
"__key" : "type",
"__value" : task,
- "boot" : boot_image,
+ "boot" : sformat ("%1boot/%2", task, config[task + "boot"]:"suse-10.2"),
"primary" : "true"
];
if (task != "iso")
ret["filesystem"] = "ext3";
- retlist = [ ret ];
+ if (task == "vmx")
+ ret["format"] = "vmdk";
+ retlist = add (retlist, ret);
}
return retlist;
}
Modified: branches/SuSE-SLE-10-SP2-Branch/product-creator/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/product-creator/src/complex.ycp?rev=45140&r1=45139&r2=45140&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/product-creator/src/complex.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/product-creator/src/complex.ycp Fri Feb 29 15:59:58 2008
@@ -667,17 +667,6 @@
ProductCreator::Config = Configurations[current]:$[];
string task = ProductCreator::Config["current_task"]:"";
list<string> to_install = [ "kiwi" ];
- if (contains ([ "iso", "xen", "vmx", "usb" ], task))
- {
- string bootdir = ProductCreator::Config["type",task,"boot"]:"";
- if (bootdir == "" ||
- (!FileUtils::Exists ("/usr/share/kiwi/image/" + bootdir) &&
- !FileUtils::Exists (bootdir))
- )
- {
- to_install = add (to_install, sformat("kiwi-desc-%1boot", task));
- }
- }
if (Package::InstallAll (to_install))
{
string dir =
Modified: branches/SuSE-SLE-10-SP2-Branch/product-creator/src/kiwi_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/product-creator/src/kiwi_dialogs.ycp?rev=45140&r1=45139&r2=45140&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/product-creator/src/kiwi_dialogs.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Fri Feb 29 15:59:58 2008
@@ -12,11 +12,12 @@
import "CWM";
import "CWMTab";
import "Directory";
- import "ProductCreator";
import "FileUtils";
import "Label";
import "Kiwi";
+ import "Package";
import "Popup";
+ import "ProductCreator";
import "SourceDialogsLite";
import "SourceManager";
import "Summary";
@@ -1965,6 +1966,22 @@
repositories = new_repositories;
}
}
+ string to_install = "";
+ if (contains ([ "iso", "xen", "vmx", "usb" ], kiwi_task))
+ {
+ string bootdir = Config["type",kiwi_task,"boot"]:"";
+ if (bootdir == "" ||
+ (!FileUtils::Exists ("/usr/share/kiwi/image/" + bootdir) &&
+ !FileUtils::Exists (bootdir))
+ )
+ {
+ to_install = sformat("kiwi-desc-%1boot", kiwi_task);
+ }
+ if (to_install != "" && !Package::Install (to_install))
+ {
+ continue;
+ }
+ }
break;
}
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org