Author: jsuchome Date: Fri Jan 25 16:19:00 2008 New Revision: 43912 URL: http://svn.opensuse.org/viewcvs/yast?rev=43912&view=rev Log: - added support for keytable and timezone keys; save preferences section with correct ordering (#355568) - 2.13.29 Modified: branches/SuSE-SLE-10-SP2-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP2-Branch/product-creator/agent-kiwi/ag_kiwi branches/SuSE-SLE-10-SP2-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP2-Branch/product-creator/src/Kiwi.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=43912&r1=43911&r2=43912&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/product-creator/VERSION Fri Jan 25 16:19:00 2008 @@ -1 +1 @@ -2.13.28 +2.13.29 Modified: branches/SuSE-SLE-10-SP2-Branch/product-creator/agent-kiwi/ag_kiwi URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/product-creator/agent-kiwi/ag_kiwi?rev=43912&r1=43911&r2=43912&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/product-creator/agent-kiwi/ag_kiwi (original) +++ branches/SuSE-SLE-10-SP2-Branch/product-creator/agent-kiwi/ag_kiwi Fri Jan 25 16:19:00 2008 @@ -60,7 +60,8 @@ } my $prefs = $optionsNodeList -> get_node(1); foreach my $tag ("packagemanager", "version", "rpm-check-signatures", - "rpm-force", "size", "defaultdestination", "defaultroot", "locale") + "rpm-force", "size", "defaultdestination", "defaultroot", "locale", + "timezone", "keytable") { my $element = $prefs -> getElementsByTagName ($tag); $retmap{$tag} = $element->get_node(1)->textContent () if ($element); 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=43912&r1=43911&r2=43912&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 Jan 25 16:19:00 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 25 15:40:06 CET 2008 - jsuchome@suse.cz + +- added support for keytable and timezone keys; save preferences + section with correct ordering (#355568) +- 2.13.29 + +------------------------------------------------------------------- Mon Jan 21 12:48:24 CET 2008 - jsuchome@suse.cz - merged texts from proofreading 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=43912&r1=43911&r2=43912&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 Jan 25 16:19:00 2008 @@ -318,7 +318,8 @@ foreach (string key, [ "author", "contact", "image_type", "specification", "packagemanager", "version", "rpm-check-signatures", "rpm-force", "sizeunit", "type", "name", "repository", "defaultdestination", - "schemeversion", "defaultroot", "inherit", "locale"], + "schemeversion", "defaultroot", "inherit", "locale", "timezone", + "keytable"], { if (config[key]:nil != nil) ret[key] = config[key]:nil; @@ -428,6 +429,7 @@ ]) ); + // for the order of keys in preferences section, see bug 355568 map preferences = $[ "__key" : "preferences", "__children" : [ @@ -452,31 +454,26 @@ "__key" : "rpm-force", "__value" : KiwiConfig["rpm-force"]:"True", ], - $[ - "__key" : "defaultdestination", - "__value" : KiwiConfig["iso-directory"]:"", - ], ], ]; + // "type" goes to the first place foreach (map typemap, get_type_values (KiwiConfig, task), { preferences["__children"] = prepend (preferences["__children"]:[], typemap); }); - if (KiwiConfig["defaultroot"]:"" != "") + // iso-directory is the correct value, it could have been altered via UI + KiwiConfig["defaultdestination"] = KiwiConfig["iso-directory"]:""; + foreach (string key, [ "keytable", "timezone", "locale", + "defaultdestination", "defaultroot" ], { - preferences["__children"] = add (preferences["__children"]:[], $[ - "__key" : "defaultroot", - "__value" : KiwiConfig["defaultroot"]:"", - ]); - } - if (KiwiConfig["locale"]:"" != "") - { - preferences["__children"] = add (preferences["__children"]:[], $[ - "__key" : "locale", - "__value" : KiwiConfig["locale"]:"", - ]); - } - + if (KiwiConfig[key]:"" != "") + { + preferences["__children"] = add (preferences["__children"]:[], $[ + "__key" : key, + "__value" : KiwiConfig[key]:"", + ]); + } + }); list write_list = [ $[ "__key" : "image", -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org