November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41716 - in /trunk/product-creator: VERSION agent-kiwi/ag_kiwi package/yast2-product-creator.changes src/Kiwi.ycp src/complex.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: jsuchome Date: Thu Nov 1 16:23:02 2007 New Revision: 41716 URL: http://svn.opensuse.org/viewcvs/yast?rev=41716&view=rev Log: - fixed checking if repository has 'plaindir' format (#338115) - show which repositories YaST failed to add (#337618) - added support for "format" and "locale" tags in config.xml - added support for OEM image type - call kiwi with --nocolor to shorten the output - 2.16.4 Modified: trunk/product-creator/VERSION trunk/product-creator/agent-kiwi/ag_kiwi trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/complex.ycp trunk/product-creator/src/kiwi_dialogs.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=4171… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Thu Nov 1 16:23:02 2007 @@ -1 +1 @@ -2.16.3 +2.16.4 Modified: trunk/product-creator/agent-kiwi/ag_kiwi URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/agent-kiwi/ag_ki… ============================================================================== --- trunk/product-creator/agent-kiwi/ag_kiwi (original) +++ trunk/product-creator/agent-kiwi/ag_kiwi Thu Nov 1 16:23:02 2007 @@ -70,12 +70,9 @@ # <type boot="vmxboot/suse-10.3" filesystem="ext3">vmx</type> my @ntag = $prefs -> getElementsByTagName ("type") -> get_nodelist(); foreach my $element (@ntag) { - my $primary = $element -> getAttribute ("primary"); - my $boot = $element -> getAttribute ("boot"); - my $flags = $element -> getAttribute ("flags"); my $type = $element -> textContent (); my %typemap = (); - foreach my $attr ("primary", "boot", "flags", "filesystem") { + foreach my $attr ("primary", "boot", "flags", "filesystem", "format") { my $val = $element -> getAttribute ($attr); $typemap{$attr} = $val if defined $val; } Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Thu Nov 1 16:23:02 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Nov 1 11:01:12 CET 2007 - jsuchome(a)suse.cz + +- fixed checking if repository has 'plaindir' format (#338115) +- show which repositories YaST failed to add (#337618) +- added support for "format" and "locale" tags in config.xml +- added support for OEM image type +- call kiwi with --nocolor to shorten the output +- 2.16.4 + +------------------------------------------------------------------- Mon Oct 29 11:13:16 CET 2007 - jsuchome(a)suse.cz - package kernel-bigsmp has been renamed to kernel-pae Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Thu Nov 1 16:23:02 2007 @@ -154,25 +154,47 @@ return deletechars (name, " \t"); } + /** - * generate the value for image type + * generate the values for image type */ - map get_type_value (map config, string task) { + list<map> get_type_values (map config, string task) { string boot_image = sformat ("%1boot/%2", task, config[task + "boot"]:"suse-10.2"); - if (config["type",task,"boot"]:"" != "") - boot_image = config["type",task,"boot"]:""; - map ret = $[ - "__key" : "type", - "__value" : task, - "primary" : "true", - "boot" : boot_image, - ]; - if (task != "iso") - ret["filesystem"] = config["type",task,"filesystem"]:"ext3"; - if (config["type",task,"flags"]:"" != "") - ret["flags"] = config["type",task,"flags"]:""; - return ret; + list<map> retlist = maplist ( + string type, map typemap, (map<string,map>)config["type"]:$[], { + + if (typemap["boot"]:"" != "") + boot_image = typemap["boot"]:""; + + map ret = $[ + "__key" : "type", + "__value" : type, + "boot" : boot_image, + ]; + if (type != "iso") + ret["filesystem"] = typemap["filesystem"]:"ext3"; + if (typemap["flags"]:"" != "") + ret["flags"] = typemap["flags"]:""; + if (typemap["format"]:"" != "") + ret["format"] = typemap["format"]:""; + if (type == task) + ret["primary"] = "true"; + return ret; + }); + if (retlist == []) + { + map ret = $[ + "__key" : "type", + "__value" : task, + "boot" : boot_image, + "primary" : "true" + ]; + if (task != "iso") + ret["filesystem"] = "ext3"; + retlist = [ ret ]; + } + return retlist; } /** @@ -287,7 +309,7 @@ foreach (string key, [ "author", "contact", "specification", "packagemanager", "version", "rpm-check-signatures", "rpm-force", "sizeunit", "type", "name", "repository", "defaultdestination", - "schemeversion", "defaultroot", "inherit"], + "schemeversion", "defaultroot", "inherit", "locale"], { if (config[key]:nil != nil) ret[key] = config[key]:nil; @@ -400,7 +422,6 @@ map preferences = $[ "__key" : "preferences", "__children" : [ - get_type_value (KiwiConfig, task), $[ "__key" : "version", "__value" : KiwiConfig["version"]:"1", @@ -428,6 +449,10 @@ ], ], ]; + foreach (map typemap, get_type_values (KiwiConfig, task), { + preferences["__children"] = prepend (preferences["__children"]:[], + typemap); + }); if (KiwiConfig["defaultroot"]:"" != "") { preferences["__children"] = add (preferences["__children"]:[], $[ @@ -435,6 +460,14 @@ "__value" : KiwiConfig["defaultroot"]:"", ]); } + if (KiwiConfig["locale"]:"" != "") + { + preferences["__children"] = add (preferences["__children"]:[], $[ + "__key" : "locale", + "__value" : KiwiConfig["locale"]:"", + ]); + } + list write_list = [ $[ @@ -602,7 +635,7 @@ }); } - string cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir); + string cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --root %1 --prepare %2 --logfile terminal", chroot_dir, config_dir); y2milestone ("calling '%1'", cmd); @@ -640,7 +673,7 @@ // now continue with creating UI::ChangeWidget (`id(`log), `LastLine, "\n"); - cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --create %1 -d %2 --logfile terminal", chroot_dir, out_dir); + cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --create %1 -d %2 --logfile terminal", chroot_dir, out_dir); y2milestone ("calling '%1'", cmd); // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?… ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Thu Nov 1 16:23:02 2007 @@ -595,8 +595,8 @@ `VWeight (1, `RichText (`id (`descr), "")), `HBox ( `PushButton (`id (`add), `opt (`key_F3), Label::AddButton ()), - `PushButton (`id (`delete), `opt (`key_F5), Label::DeleteButton ()), `PushButton (`id (`edit), `opt (`key_F4), Label::EditButton ()), + `PushButton (`id (`delete), `opt (`key_F5), Label::DeleteButton ()), `HStretch () ) ); Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Thu Nov 1 16:23:02 2007 @@ -1506,7 +1506,9 @@ // combo box item "usb" : _("USB Stick Image"), // combo box item - "vmx" : _("Virtual Disk Image") + "vmx" : _("Virtual Disk Image"), + // combo box item + "oem" : _("OEM Image") ]; list type_items = basic_type_items; @@ -1521,7 +1523,7 @@ if (haskey (task2label, type)) { type_items = add (type_items, - `item (`id (type), task2label[type]:type)); + `item (`id (type),task2label[type]:type,type == kiwi_task)); } }); default_type_items = type_items; @@ -1532,7 +1534,7 @@ //solve `back here (=no import) foreach (string type, map data, Config["type"]:$[], { type_its = add (type_its, - `item (`id (type), task2label[type]:type)); + `item (`id (type), task2label[type]:type, type == kiwi_task)); }); if (type_its != []) type_items = type_its; @@ -1799,14 +1801,16 @@ continue; map parsed = URL::Parse(url); + boolean plaindir = false; if (parsed["scheme"]:"" == "pkg") { - parsed["scheme"] = "dir"; + parsed["scheme"] = "dir"; + plaindir = true; url = URL::Build (parsed); } repositories[url] = $[ "url" : url, - "plaindir" : parsed["scheme"]:"" == "dir" + "plaindir" : plaindir, ]; update_repo_table (); } @@ -1831,14 +1835,16 @@ // remove current url + add new one repositories = remove (repositories, selected_url); map parsed = URL::Parse(url); + plaindir = false; if (parsed["scheme"]:"" == "pkg") { parsed["scheme"] = "dir"; + plaindir = true; url = URL::Build (parsed); } repositories[url] = $[ "url" : url, - "plaindir" : parsed["scheme"]:"" == "dir" + "plaindir" : plaindir ]; update_repo_table (); } @@ -1897,6 +1903,56 @@ } kiwi_task = (string) UI::QueryWidget (`id (`type), `Value); + + list<string> failed_repositories = []; + if (size (repositories) > 0) + { + map<string,integer> current_sources = $[]; + // delete current repos, that won't be used in config + foreach (map source, Pkg::SourceEditGet (), { + integer srcid = source["SrcId"]:-1; + map data = Pkg::SourceGeneralData (srcid); + string url = data["url"]:""; + current_sources[url] = srcid; + }); + // initialize new repos now + repositories = filter (string url, map repo, repositories, { + if (substring (url, 0, 1) == "/") + url = "dir://" + url; + if (haskey (current_sources, url)) + { + current_sources = remove (current_sources, url); + return true; + } + integer source_ret = -1; + if (repo["plaindir"]:false) + source_ret = Pkg::SourceCreateType (url, "", "Plaindir"); + else + source_ret = Pkg::SourceCreate (url, ""); + if (source_ret == -1) + { + failed_repositories = add (failed_repositories, url); + return false; + } + else return true; + }); + foreach (string url, integer srcid, current_sources, { + Pkg::SourceDelete (srcid); + }); + } + if (failed_repositories != []) + { + // continue/cancel popup %1 is a \n separated list + if (!Popup::ContinueCancel (sformat (_("Failed to add these repositories: + +%1. + +Continue anyway?"), mergestring (failed_repositories, "\n")))) + { + update_repo_table (); + continue; + } + } break; } } @@ -1908,44 +1964,19 @@ } if (ret == `next) { + if (size (repositories) > 0) + { + ProductCreator::enable_sources = false; + Pkg::SourceLoad(); + } Config["kiwi_configuration_" + kiwi_task] = kiwi_configuration; Config["_imported"] = true; Config["iso-directory"] = out_dir + (new_configuration ? "/" + name : ""); Config["name"] = name; + Config["new_configuration"] = new_configuration; Config["sources"] = maplist ( string url, map repo, repositories, ``(url)); - Config["new_configuration"] = new_configuration; - if (Config["sources"]:[] != []) - { - ProductCreator::enable_sources = false; - map<string,integer> current_sources = $[]; - // delete current repos, that won't be used in config - foreach (map source, Pkg::SourceEditGet (), { - integer srcid = source["SrcId"]:-1; - map data = Pkg::SourceGeneralData (srcid); - string url = data["url"]:""; - current_sources[url] = srcid; - }); - // initialize new repos now - foreach (string url, map repo, repositories, { - if (substring (url, 0, 1) == "/") - url = "dir://" + url; - if (haskey (current_sources, url)) - { - current_sources = remove (current_sources, url); - return; - } - if (repo["plaindir"]:false) - Pkg::SourceCreateType (url, "", "Plaindir"); - else - Pkg::SourceCreate (url, ""); - }); - foreach (string url, integer srcid, current_sources, { - Pkg::SourceDelete (srcid); - }); - Pkg::SourceLoad(); - } ProductCreator::Config = Config; Kiwi::current_repositories = repositories; Kiwi::kiwi_task = kiwi_task; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41715 - /tags/branch-SLE-10-SP1-2_13_19/product-creator/
by jsuchome＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: jsuchome Date: Thu Nov 1 16:16:42 2007 New Revision: 41715 URL: http://svn.opensuse.org/viewcvs/yast?rev=41715&view=rev Log: Created tag branch-SLE-10-SP1-2_13_19 for product-creator Added: tags/branch-SLE-10-SP1-2_13_19/product-creator/ - copied from r41714, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41714 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION agent-kiwi/ag_kiwi package/yast2-product-creator.changes src/Kiwi.ycp src/complex.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: jsuchome Date: Thu Nov 1 16:15:59 2007 New Revision: 41714 URL: http://svn.opensuse.org/viewcvs/yast?rev=41714&view=rev Log: - save all types from the template to target config.xml - show correct list of repositories when going back (#337862) - fixed checking if repository has 'plaindir' format (#338115) - show which repositories YaST failed to add (#337618) - added support for "format" and "locale" tags in config.xml - added support for OEM image type - 2.13.19 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/agent-kiwi/ag_kiwi branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Thu Nov 1 16:15:59 2007 @@ -1 +1 @@ -2.13.18 +2.13.19 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/agent-kiwi/ag_kiwi URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/agent-kiwi/ag_kiwi (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/agent-kiwi/ag_kiwi Thu Nov 1 16:15:59 2007 @@ -70,12 +70,9 @@ # <type boot="vmxboot/suse-10.3" filesystem="ext3">vmx</type> my @ntag = $prefs -> getElementsByTagName ("type") -> get_nodelist(); foreach my $element (@ntag) { - my $primary = $element -> getAttribute ("primary"); - my $boot = $element -> getAttribute ("boot"); - my $flags = $element -> getAttribute ("flags"); my $type = $element -> textContent (); my %typemap = (); - foreach my $attr ("primary", "boot", "flags", "filesystem") { + foreach my $attr ("primary", "boot", "flags", "filesystem", "format") { my $val = $element -> getAttribute ($attr); $typemap{$attr} = $val if defined $val; } Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Thu Nov 1 16:15:59 2007 @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Thu Nov 1 10:57:39 CET 2007 - jsuchome(a)suse.cz + +- save all types from the template to target config.xml +- show correct list of repositories when going back (#337862) +- fixed checking if repository has 'plaindir' format (#338115) +- show which repositories YaST failed to add (#337618) +- added support for "format" and "locale" tags in config.xml +- added support for OEM image type +- 2.13.19 + +------------------------------------------------------------------- Fri Oct 26 10:25:49 CEST 2007 - jsuchome(a)suse.cz - fix the sequence for going to kiwi image from main summary Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Thu Nov 1 16:15:59 2007 @@ -154,25 +154,47 @@ return deletechars (name, " \t"); } + /** - * generate the value for image type + * generate the values for image type */ - map get_type_value (map config, string task) { + list<map> get_type_values (map config, string task) { string boot_image = sformat ("%1boot/%2", task, config[task + "boot"]:"suse-10.2"); - if (config["type",task,"boot"]:"" != "") - boot_image = config["type",task,"boot"]:""; - map ret = $[ - "__key" : "type", - "__value" : task, - "primary" : "true", - "boot" : boot_image, - ]; - if (task != "iso") - ret["filesystem"] = config["type",task,"filesystem"]:"ext3"; - if (config["type",task,"flags"]:"" != "") - ret["flags"] = config["type",task,"flags"]:""; - return ret; + list<map> retlist = maplist ( + string type, map typemap, (map<string,map>)config["type"]:$[], { + + if (typemap["boot"]:"" != "") + boot_image = typemap["boot"]:""; + + map ret = $[ + "__key" : "type", + "__value" : type, + "boot" : boot_image, + ]; + if (type != "iso") + ret["filesystem"] = typemap["filesystem"]:"ext3"; + if (typemap["flags"]:"" != "") + ret["flags"] = typemap["flags"]:""; + if (typemap["format"]:"" != "") + ret["format"] = typemap["format"]:""; + if (type == task) + ret["primary"] = "true"; + return ret; + }); + if (retlist == []) + { + map ret = $[ + "__key" : "type", + "__value" : task, + "boot" : boot_image, + "primary" : "true" + ]; + if (task != "iso") + ret["filesystem"] = "ext3"; + retlist = [ ret ]; + } + return retlist; } /** @@ -287,7 +309,7 @@ foreach (string key, [ "author", "contact", "specification", "packagemanager", "version", "rpm-check-signatures", "rpm-force", "sizeunit", "type", "name", "repository", "defaultdestination", - "schemeversion", "defaultroot", "inherit"], + "schemeversion", "defaultroot", "inherit", "locale"], { if (config[key]:nil != nil) ret[key] = config[key]:nil; @@ -400,7 +422,6 @@ map preferences = $[ "__key" : "preferences", "__children" : [ - get_type_value (KiwiConfig, task), $[ "__key" : "version", "__value" : KiwiConfig["version"]:"1", @@ -428,6 +449,10 @@ ], ], ]; + foreach (map typemap, get_type_values (KiwiConfig, task), { + preferences["__children"] = prepend (preferences["__children"]:[], + typemap); + }); if (KiwiConfig["defaultroot"]:"" != "") { preferences["__children"] = add (preferences["__children"]:[], $[ @@ -435,6 +460,13 @@ "__value" : KiwiConfig["defaultroot"]:"", ]); } + if (KiwiConfig["locale"]:"" != "") + { + preferences["__children"] = add (preferences["__children"]:[], $[ + "__key" : "locale", + "__value" : KiwiConfig["locale"]:"", + ]); + } list write_list = [ $[ Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp Thu Nov 1 16:15:59 2007 @@ -593,8 +593,8 @@ `VWeight (1, `RichText (`id (`descr), "")), `HBox ( `PushButton (`id (`add), `opt (`key_F3), Label::AddButton ()), - `PushButton (`id (`delete), `opt (`key_F5), Label::DeleteButton ()), `PushButton (`id (`edit), `opt (`key_F4), Label::EditButton ()), + `PushButton (`id (`delete), `opt (`key_F5), Label::DeleteButton ()), `HStretch () ) ); Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Thu Nov 1 16:15:59 2007 @@ -1505,7 +1505,9 @@ // combo box item "usb" : _("USB Stick Image"), // combo box item - "vmx" : _("Virtual Disk Image") + "vmx" : _("Virtual Disk Image"), + // combo box item + "oem" : _("OEM Image") ]; list type_items = basic_type_items; @@ -1520,7 +1522,7 @@ if (haskey (task2label, type)) { type_items = add (type_items, - `item (`id (type), task2label[type]:type)); + `item (`id (type),task2label[type]:type,type == kiwi_task)); } }); default_type_items = type_items; @@ -1531,7 +1533,7 @@ //solve `back here (=no import) foreach (string type, map data, Config["type"]:$[], { type_its = add (type_its, - `item (`id (type), task2label[type]:type)); + `item (`id (type), task2label[type]:type, type == kiwi_task)); }); if (type_its != []) type_items = type_its; @@ -1782,14 +1784,16 @@ continue; map parsed = URL::Parse(url); + boolean plaindir = false; if (parsed["scheme"]:"" == "pkg") { parsed["scheme"] = "dir"; + plaindir = true; url = URL::Build (parsed); } repositories[url] = $[ "url" : url, - "plaindir" : parsed["scheme"]:"" == "dir" + "plaindir" : plaindir ]; update_repo_table (); } @@ -1814,14 +1818,16 @@ // remove current url + add new one repositories = remove (repositories, selected_url); map parsed = URL::Parse(url); + plaindir = false; if (parsed["scheme"]:"" == "pkg") { parsed["scheme"] = "dir"; + plaindir = true; url = URL::Build (parsed); } repositories[url] = $[ "url" : url, - "plaindir" : parsed["scheme"]:"" == "dir" + "plaindir" : plaindir ]; update_repo_table (); } @@ -1880,6 +1886,56 @@ } kiwi_task = (string) UI::QueryWidget (`id (`type), `Value); + + list<string> failed_repositories = []; + if (size (repositories) > 0) + { + map<string,integer> current_sources = $[]; + // delete current repos, that won't be used in config + foreach (map source, Pkg::SourceEditGet (), { + integer srcid = source["SrcId"]:-1; + map data = Pkg::SourceGeneralData (srcid); + string url = data["url"]:""; + current_sources[url] = srcid; + }); + // initialize new repos now + repositories = filter (string url, map repo, repositories, { + if (substring (url, 0, 1) == "/") + url = "dir://" + url; + if (haskey (current_sources, url)) + { + current_sources = remove (current_sources, url); + return true; + } + integer source_ret = -1; + if (repo["plaindir"]:false) + source_ret = Pkg::SourceCreateType (url, "", "Plaindir"); + else + source_ret = Pkg::SourceCreate (url, ""); + if (source_ret == -1) + { + failed_repositories = add (failed_repositories, url); + return false; + } + else return true; + }); + foreach (string url, integer srcid, current_sources, { + Pkg::SourceDelete (srcid); + }); + } + if (failed_repositories != []) + { + // continue/cancel popup %1 is a \n separated list + if (!Popup::ContinueCancel (sformat (_("Failed to add these repositories: + +%1. + +Continue anyway?"), mergestring (failed_repositories, "\n")))) + { + update_repo_table (); + continue; + } + } break; } } @@ -1891,44 +1947,19 @@ } if (ret == `next) { + if (size (repositories) > 0) + { + ProductCreator::enable_sources = false; + Pkg::SourceLoad(); + } Config["kiwi_configuration_" + kiwi_task] = kiwi_configuration; Config["_imported"] = true; Config["iso-directory"] = out_dir + (new_configuration ? "/" + name : ""); Config["name"] = name; + Config["new_configuration"] = new_configuration; Config["sources"] = maplist ( string url, map repo, repositories, ``(url)); - Config["new_configuration"] = new_configuration; - if (Config["sources"]:[] != []) - { - ProductCreator::enable_sources = false; - map<string,integer> current_sources = $[]; - // delete current repos, that won't be used in config - foreach (map source, Pkg::SourceEditGet (), { - integer srcid = source["SrcId"]:-1; - map data = Pkg::SourceGeneralData (srcid); - string url = data["url"]:""; - current_sources[url] = srcid; - }); - // initialize new repos now - foreach (string url, map repo, repositories, { - if (substring (url, 0, 1) == "/") - url = "dir://" + url; - if (haskey (current_sources, url)) - { - current_sources = remove (current_sources, url); - return; - } - if (repo["plaindir"]:false) - Pkg::SourceCreateType (url, "", "Plaindir"); - else - Pkg::SourceCreate (url, ""); - }); - foreach (string url, integer srcid, current_sources, { - Pkg::SourceDelete (srcid); - }); - Pkg::SourceLoad(); - } ProductCreator::Config = Config; Kiwi::current_repositories = repositories; Kiwi::kiwi_task = kiwi_task; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41713 - /tags/stable-2_16_0/runlevel/
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 16:13:49 2007 New Revision: 41713 URL: http://svn.opensuse.org/viewcvs/yast?rev=41713&view=rev Log: Created tag stable-2_16_0 for runlevel Added: tags/stable-2_16_0/runlevel/ - copied from r41712, trunk/runlevel/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41712 - in /trunk/runlevel: VERSION package/yast2-runlevel.changes src/runlevel_finish.ycp yast2-runlevel.spec.in
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 16:13:30 2007 New Revision: 41712 URL: http://svn.opensuse.org/viewcvs/yast?rev=41712&view=rev Log: - Removed dependency on yast2-update - Client runlevel_finish doesn't rewrite runlevel configuration in case of update - /etc/inittab is not owned by yast2-runlevel. - 2.16.0 Modified: trunk/runlevel/VERSION trunk/runlevel/package/yast2-runlevel.changes trunk/runlevel/src/runlevel_finish.ycp trunk/runlevel/yast2-runlevel.spec.in Modified: trunk/runlevel/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/VERSION?rev=41712&r1=41… ============================================================================== --- trunk/runlevel/VERSION (original) +++ trunk/runlevel/VERSION Thu Nov 1 16:13:30 2007 @@ -1 +1 @@ -2.15.3 +2.16.0 Modified: trunk/runlevel/package/yast2-runlevel.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/package/yast2-runlevel.… ============================================================================== --- trunk/runlevel/package/yast2-runlevel.changes (original) +++ trunk/runlevel/package/yast2-runlevel.changes Thu Nov 1 16:13:30 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Nov 1 16:10:27 CET 2007 - locilka(a)suse.cz + +- Removed dependency on yast2-update +- Client runlevel_finish doesn't rewrite runlevel configuration in + case of update - /etc/inittab is not owned by yast2-runlevel. +- 2.16.0 + +------------------------------------------------------------------- Wed Aug 29 15:04:37 CEST 2007 - locilka(a)suse.cz - Fixed used buttons in runlevel proposal (#305899). Modified: trunk/runlevel/src/runlevel_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/src/runlevel_finish.ycp… ============================================================================== --- trunk/runlevel/src/runlevel_finish.ycp (original) +++ trunk/runlevel/src/runlevel_finish.ycp Thu Nov 1 16:13:30 2007 @@ -19,7 +19,6 @@ import "Mode"; import "RunlevelEd"; import "Directory"; -import "Update"; any ret = nil; string func = ""; @@ -67,10 +66,7 @@ } else { - // Set default runlevel cause inittab will be overwritten by - // installing aaa_base - - set_runlevel (Update::last_runlevel != -1 ? Update::last_runlevel : 3); + y2milestone ("Update mode, no need to set runlevel again..."); } } Modified: trunk/runlevel/yast2-runlevel.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/runlevel/yast2-runlevel.spec.in?… ============================================================================== --- trunk/runlevel/yast2-runlevel.spec.in (original) +++ trunk/runlevel/yast2-runlevel.spec.in Thu Nov 1 16:13:30 2007 @@ -5,9 +5,6 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 -# Required only in Inst-Sys -# Requires: yast2-update - Provides: yast2-config-runlevel Obsoletes: yast2-config-runlevel Provides: yast2-trans-runlevel -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41711 - in /trunk/python-bindings/src: YPython.cc YPython.h YPythonNamespace.cc
by juhliarik＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: juhliarik Date: Thu Nov 1 15:59:45 2007 New Revision: 41711 URL: http://svn.opensuse.org/viewcvs/yast?rev=41711&view=rev Log: added patch for finding namespace and function Modified: trunk/python-bindings/src/YPython.cc trunk/python-bindings/src/YPython.h trunk/python-bindings/src/YPythonNamespace.cc Modified: trunk/python-bindings/src/YPython.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.cc?r… ============================================================================== --- trunk/python-bindings/src/YPython.cc (original) +++ trunk/python-bindings/src/YPython.cc Thu Nov 1 15:59:45 2007 @@ -621,6 +621,36 @@ return ns; } + +/** + * Find function in Global Dictionary + * confirm if function is from imported module or not + * return 1 if module is in dictionary and function too + * retrun 0 if module is in dictionary and function not + * return -1 if missing both (module and dinctionary) +**/ + +int YPython::findModuleFuncInDict(string module, string function) { + + PyObject* pMainDict = NULL; // dictionary of module + PyObject* pFunc = NULL; // function from dictionary + + //obtain correct dictionary for module + pMainDict = PyDict_GetItemString(YPython::yPython()->pMainDicts(),module.c_str()); + + //obtain function from dictionary + if (pMainDict) + pFunc = PyDict_GetItemString(pMainDict, function.c_str()); + else + return -1; + + if (pFunc) + return 1; + else + return 0; +} + + /** * Convert Python Function to YCPCode. * @@ -643,11 +673,12 @@ //delete last 3 chars from module name ".py" module_name.erase(module_name.size()-3); + int find = findModuleFuncInDict(module_name, fun_name); + if (find) { Y2Namespace *ns = getNs (module_name.c_str(),fun_name.c_str()); if (ns) { - cout <<"ns bolo najdene!!! "<< endl; TableEntry *sym_te = ns->table ()->find (fun_name.c_str()); if (sym_te == NULL) { y2error ("No such symbol %s::%s", module_name.c_str(), fun_name.c_str()); @@ -662,6 +693,7 @@ return YCPNull(); } + } return YCPNull(); } Modified: trunk/python-bindings/src/YPython.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPython.h?re… ============================================================================== --- trunk/python-bindings/src/YPython.h (original) +++ trunk/python-bindings/src/YPython.h Thu Nov 1 15:59:45 2007 @@ -116,8 +116,16 @@ private: - + /** + * Find function in Global Dictionary + * confirm if function is from imported module or not + * return 1 if module is in dictionary and function too + * retrun 0 if module is in dictionary and function not + * return -1 if missing both (module and dinctionary) + **/ + + int findModuleFuncInDict(string module, string function); /** * Convert a Python list to a YCPList. Modified: trunk/python-bindings/src/YPythonNamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/python-bindings/src/YPythonNames… ============================================================================== --- trunk/python-bindings/src/YPythonNamespace.cc (original) +++ trunk/python-bindings/src/YPythonNamespace.cc Thu Nov 1 15:59:45 2007 @@ -154,7 +154,7 @@ PyObject * fun_code; //code of function //Declarations (using YPCDelcarations python module) - //YCPDeclarations *decl = YCPDeclarations::instance(); + YCPDeclarations *decl = YCPDeclarations::instance(); //YCPDeclarations *decl = new YCPDeclarations(); FunctionTypePtr sym_tp; @@ -192,7 +192,7 @@ fun_code = PyFunction_GetCode(pFunc); num = ((PyCodeObject *) fun_code)->co_argcount; - /* + if (decl->exists((PyFunctionObject *)pFunc) && decl->numParams((PyFunctionObject *)pFunc) == num){ @@ -203,14 +203,14 @@ for (int i=0; i < tmp; i++){ sym_tp->concat(list_of_types[i]); } - }else{*/ + }else{ sym_tp = new FunctionType(Type::Any); //y2milestone ("Number of parameters: %d", num); //add types and number of arguments into SymbolEntry table for (long j = 0; j < num; j++) { sym_tp->concat(Type::Any); } - //} + } //y2milestone ("Callable function %s", PyString_AsString(item)); // symbol entry for the function SymbolEntry *fun_se = new SymbolEntry ( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41710 - in /trunk/update: package/yast2-update.changes yast2-update.spec.in
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 15:40:39 2007 New Revision: 41710 URL: http://svn.opensuse.org/viewcvs/yast?rev=41710&view=rev Log: - Removed #!BuildIgnore: autoyast2-installation because recent changes have already fixed the dependency loop. Modified: trunk/update/package/yast2-update.changes trunk/update/yast2-update.spec.in Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Thu Nov 1 15:40:39 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 1 15:39:45 CET 2007 - locilka(a)suse.cz + +- Removed #!BuildIgnore: autoyast2-installation because recent + changes have already fixed the dependency loop. + +------------------------------------------------------------------- Wed Oct 31 13:21:55 CET 2007 - locilka(a)suse.cz - installedVersion and updateVersion moved from 'Update' to Modified: trunk/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=… ============================================================================== --- trunk/update/yast2-update.spec.in (original) +++ trunk/update/yast2-update.spec.in Thu Nov 1 15:40:39 2007 @@ -5,9 +5,6 @@ BuildRequires: yast2 >= 2.16.4 # package not really needed to be installed but this breaks the building cycle -# FIXME !!! -#!BuildIgnore: autoyast2-installation - # Installation::installedVersion && Installation::updateVersion Requires: yast2 >= 2.16.4 Requires: yast2-installation -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41709 - /tags/stable-2_16_1/users/
by jsuchome＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: jsuchome Date: Thu Nov 1 15:35:31 2007 New Revision: 41709 URL: http://svn.opensuse.org/viewcvs/yast?rev=41709&view=rev Log: Created tag stable-2_16_1 for users Added: tags/stable-2_16_1/users/ - copied from r41708, trunk/users/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41708 - in /trunk/users: VERSION package/yast2-users.changes src/UsersCache.pm
by jsuchome＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: jsuchome Date: Thu Nov 1 15:35:26 2007 New Revision: 41708 URL: http://svn.opensuse.org/viewcvs/yast?rev=41708&view=rev Log: - do not include default 'lxuser' name in the list of suggestions - 2.16.1 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersCache.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=41708&r1=41707… ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Thu Nov 1 15:35:26 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.change… ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Thu Nov 1 15:35:26 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 1 15:20:31 CET 2007 - jsuchome(a)suse.cz + +- do not include default 'lxuser' name in the list of suggestions +- 2.16.1 + +------------------------------------------------------------------- Fri Oct 19 10:53:46 CEST 2007 - jsuchome(a)suse.cz - check for empty lines in passwd/group/shadow (#333305) Modified: trunk/users/src/UsersCache.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersCache.pm?rev=4170… ============================================================================== --- trunk/users/src/UsersCache.pm (original) +++ trunk/users/src/UsersCache.pm Thu Nov 1 15:35:26 2007 @@ -150,7 +150,6 @@ } $i++; } - $tested_usernames{$default_login} = 1; # 2nd: check existence foreach my $name (sort keys %tested_usernames) { @@ -165,6 +164,9 @@ } push @proposed_usernames, $name; }; + if (@proposed_usernames < 1 && !$self->UsernameExists ($default_login)){ + push @proposed_usernames, $default_login; + } if (!$self->UsernameExists ("$the_answer") && @proposed_usernames > 11){ push @proposed_usernames, "$the_answer"; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41707 - /tags/stable-2_16_0/restore/
by locilka＠svn.opensuse.org 01 Nov '07

01 Nov '07

Author: locilka Date: Thu Nov 1 15:25:12 2007 New Revision: 41707 URL: http://svn.opensuse.org/viewcvs/yast?rev=41707&view=rev Log: Created tag stable-2_16_0 for restore Added: tags/stable-2_16_0/restore/ - copied from r41706, trunk/restore/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0