YaST Commits March 2008

yast-commit@lists.opensuse.org

29 participants
759 discussions

[yast-commit] r45854 - /trunk/gtk/NEWS
by jproseve＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: jproseve Date: Fri Mar 28 17:02:40 2008 New Revision: 45854 URL: http://svn.opensuse.org/viewcvs/yast?rev=45854&view=rev Log: Touch a file to get auth realm access Modified: trunk/gtk/NEWS Modified: trunk/gtk/NEWS URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/NEWS?rev=45854&r1=45853&r2=4… ============================================================================== --- trunk/gtk/NEWS (original) +++ trunk/gtk/NEWS Fri Mar 28 17:02:40 2008 @@ -1 +1 @@ -No news yet. \ No newline at end of file +No news yet \ No newline at end of file -- 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] r45853 - /tags/stable-2_16_11/product-creator/
by jsuchome＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: jsuchome Date: Fri Mar 28 16:26:07 2008 New Revision: 45853 URL: http://svn.opensuse.org/viewcvs/yast?rev=45853&view=rev Log: Created tag stable-2_16_11 for product-creator Added: tags/stable-2_16_11/product-creator/ - copied from r45852, trunk/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] r45852 - in /trunk/product-creator: VERSION agent-kiwi/ag_kiwi package/yast2-product-creator.changes src/Kiwi.ycp src/complex.ycp src/dialogs.ycp src/kiwi_dialogs.ycp yast2-product-creator.spec.in
by jsuchome＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: jsuchome Date: Fri Mar 28 16:26:02 2008 New Revision: 45852 URL: http://svn.opensuse.org/viewcvs/yast?rev=45852&view=rev Log: - 2.16.11 - use new ag_anyxml to read parts of config.xml (WIP) - show package lists in different kiwi profiles - neutralize package and pattern selection before opening package selector - do not return patterns selected by dependencies from package selector (requires transact_by in Pkg:ResolvableProperties) - 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 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/dialogs.ycp trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/yast2-product-creator.spec.in Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=4585… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Fri Mar 28 16:26:02 2008 @@ -1 +1 @@ -2.16.10 +2.16.11 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 Fri Mar 28 16:26:02 2008 @@ -114,10 +114,12 @@ my $name = $element -> getAttribute ("name"); my $pwd = $element -> getAttribute ("pwd"); my $home = $element -> getAttribute ("home"); + my $realname = $element -> getAttribute ("realname"); if (defined $name) { $retmap{"users"}{$name}{group} = $group if (defined $group); $retmap{"users"}{$name}{home} = $home if (defined $home); $retmap{"users"}{$name}{pwd} = $pwd if (defined $pwd); + $retmap{"users"}{$name}{realname} = $realname if (defined $realname); } } } 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 Fri Mar 28 16:26:02 2008 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Fri Mar 28 16:12:34 CET 2008 - jsuchome(a)suse.cz + +- use new ag_anyxml to read parts of config.xml (WIP) +- show package lists in different kiwi profiles +- neutralize package and pattern selection before opening package + selector +- do not return patterns selected by dependencies from package + selector (requires transact_by in Pkg:ResolvableProperties) +- 2.16.11 + +------------------------------------------------------------------- +Tue Mar 25 09:05:06 CET 2008 - jsuchome(a)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 + +------------------------------------------------------------------- Tue Mar 25 08:49:22 CET 2008 - lslezak(a)suse.cz - always update metadata in content files (bnc#368146) 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 Fri Mar 28 16:26:02 2008 @@ -178,6 +178,8 @@ 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"; return ret; @@ -192,6 +194,8 @@ ]; if (task != "iso") ret["filesystem"] = "ext3"; + if (task == "vmx") + ret["format"] = "vmdk"; retlist = [ ret ]; } return retlist; @@ -199,6 +203,7 @@ /** * generate the list of packages/patterns for image + * FIXME generate from new map... */ map get_image_packages (map config, list packages, list patterns,list ignored) { @@ -222,6 +227,7 @@ "user" : true, "source" : true, "file" : true, // for drivers section + "profile" : true, ]; /** @@ -235,7 +241,8 @@ integer i = 0; while (i < level) { i = i + 1; - tab = tab + "\t"; +// tab = tab + "\t"; + tab = tab + " "; } string key = descr["__key"]:""; if (key == "") return ""; @@ -279,36 +286,13 @@ if (config == nil) return ret; map<string,map> packages = config["packages"]:$[]; - // rest parts of "packages" are saved in product-creator map - ret["ignore"] = maplist (map p, - (list<map>)packages["image","ignore"]:[], ``(p["name"]:"")); - // value of "arch" is currently ignored... - foreach (string section, [ "boot", "xen" ], { - ret[section + "_packages"] = maplist (map p, - (list<map>)packages[section, "package"]:[], ``(p["name"]:"")); - ret[section + "_patterns"] = maplist (map p, - (list<map>)packages[section,"opensusePattern"]:[],``(p["name"]:"")); - ret[section + "_ignore"] = maplist (map p, - (list<map>)packages[section, "ignore"]:[], ``(p["name"]:"")); - }); - // list of packages and patterns is needed for import, not for new image - ret["addons"] = maplist (map p, - (list<map>)packages["image","opensusePattern"]:[], ``(p["name"]:"")); - ret["packages"] = maplist (map p, - (list<map>)packages["image","package"]:[], ``(p["name"]:"")); - if (haskey (packages, "delete")) - { - ret["delete_packages"] = maplist (map p, - (list<map>)packages["delete", "package"]:[], ``(p["name"]:"")); - } - - if (packages["image","patternType"]:"" != "") - ret["image_patternType"] = packages["image","patternType"]:""; + // FIXME these should be part of "packages" already... if (packages["xen","disk"]:"" != "") ret["xen_disk"] = packages["xen","disk"]:""; if (packages["xen","memory"]:"" != "") ret["xen_memory"] = tointeger (packages["xen","memory"]:"512"); + foreach (string key, [ "author", "contact", "image_type", "specification", "packagemanager", "version", "rpm-check-signatures", "rpm-force", "sizeunit", "type", "name", "repository", "defaultdestination", @@ -334,7 +318,16 @@ "group" : usermap["group"]:"", "username" : user, ]; + //FIXME save this, show in UI... + if (usermap["realname"]:"" != "") + ret["users",user,"realname"] = usermap["realname"]:""; }); + + map anyxml = (map) SCR::Read (.anyxml, base_path + "/config.xml"); + map image = anyxml["image",0]:$[]; + ret["packages"] = image["packages"]:[]; + ret["profiles"] = image["profiles"]:[]; + ret["split"] = image["split"]:[]; return ret; } @@ -355,51 +348,10 @@ KiwiConfig["defaultroot"] = chroot_dir; } - list packages_list = []; - list patterns_list = []; - list ignored_list = []; - list packages_boot_list = []; - list patterns_boot_list = []; - list ignored_boot_list = []; - list packages_xen_list = []; list patterns_xen_list = []; list ignored_xen_list = []; - foreach (string package, (list<string>) KiwiConfig["packages"]:[], { - packages_list = add (packages_list, $[ - "__key" : "package", - "name" : package, - ]); - }); - foreach (string pattern, (list<string>) KiwiConfig["addons"]:[], { - patterns_list = add (patterns_list, $[ - "__key" : "opensusePattern", - "name" : pattern, - ]); - }); - foreach (string package, (list<string>) KiwiConfig["ignore"]:[], { - ignored_list = add (ignored_list, $[ - "__key" : "ignore", - "name" : package, - ]); - }); - list<string> boot_packages = - KiwiConfig["boot_packages"]:["filesystem", "glibc-locale", "kernel-default", "devs" ]; - foreach (string package, boot_packages, { - packages_boot_list = add (packages_boot_list, $[ - "__key" : "package", - "name" : package, - ]); - }); - foreach (string ignore, KiwiConfig["boot_ignore"]:[], { - ignored_boot_list = add (ignored_boot_list, $[ - "__key" : "ignore", - "name" : ignore, - ]); - }); - - foreach (string package, KiwiConfig["xen_packages"]:[], { packages_xen_list = add (packages_xen_list, $[ "__key" : "package", @@ -451,10 +403,6 @@ "__key" : "rpm-force", "__value" : KiwiConfig["rpm-force"]:"True", ], - $[ - "__key" : "defaultdestination", - "__value" : KiwiConfig["iso-directory"]:"", - ], ], ]; // "type" goes to the first place @@ -476,8 +424,6 @@ } }); - - list write_list = [ $[ "__key" : "image", "name" : KiwiConfig["name"]:"", @@ -506,6 +452,16 @@ ]]; if (KiwiConfig["inherit"]:"" != "") write_list[0,"inherit"] = KiwiConfig["inherit"]:""; + if (haskey (KiwiConfig, "profiles")) + { + write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ + "__key" : "profiles", + "__children" : maplist ( + map profile, KiwiConfig["profiles",0,"profile"]:[], { + return union ($[ "__key" : "profile"], profile); + }) + ]); + } if (haskey (KiwiConfig, "users")) { map<string,list> groups2users = $[]; @@ -521,14 +477,17 @@ write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ "__key" : "users", "group" : group, - "__children" : maplist (map usermap, (list<map>) userlist, ``( - $[ + "__children" : maplist (map usermap, (list<map>) userlist, { + map u = $[ "__key" : "user", "name" : usermap["username"]:"", "pwd" : (usermap["encrypted"]:false) ? usermap["pwd"]:"" : crypt_password (usermap["pwd"]:""), "home" : usermap["home"]:"", - ] - )) + ]; + if (usermap["realname"]:"" != "") + u["realname"] = usermap["realname"]:""; + return u; + }) ]); }); } @@ -537,15 +496,64 @@ ``(get_source_value (source, KiwiConfig)) ) ); - write_list[0,"__children"] = union (write_list[0,"__children"]:[], [ - get_image_packages ( - KiwiConfig, packages_list, patterns_list, ignored_list), + map image_packages = $[]; + list<map> profiles_packages = []; // + FIXME XEN + delete are here? + map bootstrap_packages = $[]; + foreach (map packagemap, KiwiConfig["packages"]:[], { + /* example of packagemap: $[ - "__key" : "packages", - "type" : "boot", - "__children": union (union (packages_boot_list, patterns_boot_list), ignored_boot_list) - ], - ]); + "opensusePattern" : [ + $[ "name":"base" ], + $[ "name":"x11" ] + ], + "package" : [ $[ "name":"zypper" ] ], + "type" : "image", + "profiles" : "KDE" + ]*/ + map pmap = union (packagemap, $[ + "__key" : "packages", + ]); + string type = pmap["type"]:""; + pmap["__children"] = maplist (map p, pmap["package"]:[], ``( + union (p, $[ "__key" : "package"])) + ); + if (haskey (pmap, "package")) + pmap = remove (pmap,"package"); + if (haskey (pmap, "ignore")) + { + pmap["__children"] = union (pmap["__children"]:[], + maplist (map p, pmap["ignore"]:[], ``( + union (p, $[ "__key" : "ignore"])) + ) + ); + pmap = remove (pmap, "ignore"); + } + if (haskey (pmap, "opensusePattern")) + { + pmap["__children"] = union (pmap["__children"]:[], + maplist (map p, pmap["opensusePattern"]:[], ``( + union (p, $[ "__key" : "opensusePattern"])) + ) + ); + pmap = remove (pmap,"opensusePattern"); + } + if (type == "bootstrap") + bootstrap_packages = pmap; + else if (type == "image" && pmap["profiles"]:"" == "") + image_packages = pmap; + else + profiles_packages = add (profiles_packages, pmap); + }); + if (image_packages != $[]) + write_list[0,"__children"] = + add (write_list[0,"__children"]:[], image_packages); + if (profiles_packages != []) + write_list[0,"__children"] = + union (write_list[0,"__children"]:[], profiles_packages); + if (bootstrap_packages != $[]) + write_list[0,"__children"] = + add (write_list[0,"__children"]:[], bootstrap_packages); + /* if (task == "xen") { write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ @@ -566,8 +574,24 @@ "__children": packages_delete_list ]); } + */ + if (haskey (KiwiConfig, "split")) + write_list[0,"__children"] = add (write_list[0,"__children"]:[], $[ + "__key" : "split", + /* FIXME + "__children": maplist (map what, KiwiConfig["split"]:[], { + map ret = $[]; + foreach (string k, list val, what, { + ret["__key"] = k; + ret + }); + return ret; + }); + */ + ]); - string write_string = Map2XML (write_list[0]:$[], 0); + string write_string = "<?xml version=\"1.0\"?>\n" + + Map2XML (write_list[0]:$[], 0); config_dir = tmp_dir + "/" + KiwiConfig["name"]:""; SCR::Execute (.target.mkdir, config_dir); SCR::Write (.target.string, config_dir + "/config.xml", write_string); @@ -693,6 +717,7 @@ UI::ChangeWidget (`id(`log), `LastLine, "\n"); cmd = sformat ("ZYPP_READONLY_HACK=1 kiwi --nocolor --create %1 -d %2 --logfile terminal", chroot_dir, out_dir); y2milestone ("calling '%1'", cmd); +// FIXME ask for profiles, than call with --add-profile <profile-name> // label UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); SCR::Execute (.background.run_output_err, cmd); 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 Fri Mar 28 16:26:02 2008 @@ -698,17 +698,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: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?… ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Fri Mar 28 16:26:02 2008 @@ -953,6 +953,9 @@ any ret = nil; + Pkg::ResolvableNeutral ("", `package, true); + Pkg::ResolvableNeutral ("", `pattern, true); + // set a mount point - there is no use to display DU of the current system Pkg::TargetInitDU([ $[ "name" : "/", "free" : ProductCreator::max_size_mb * 1024, @@ -1215,7 +1218,17 @@ } else { - seladd = Pkg::GetPatterns(`selected, ""); + // do not return patterns selected by dependencies + foreach (map pat, Pkg::ResolvableProperties ("", `pattern, ""), + { + if (pat["status"]:`none == `selected) + { + y2milestone ("pat %1 selected by %2" , pat["name"]:"", + pat["transact_by"]:nil); + if (pat["transact_by"]:nil != `solver) + seladd = add (seladd, pat["name"]:""); + } + }); selbase = Pkg::GetPatterns(`selected, "base"); } } 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 Fri Mar 28 16:26:02 2008 @@ -12,12 +12,13 @@ import "CWM"; import "CWMTab"; import "Directory"; - import "ProductCreator"; import "FileUtils"; import "Label"; import "Kiwi"; + import "Package"; import "PackageSystem"; import "Popup"; + import "ProductCreator"; import "SourceDialogs"; import "SourceManager"; import "Summary"; @@ -55,9 +56,9 @@ return ret; } - /******************************************************************************************** + /***************************************************************************** * widget handlers - *******************************************************************************************/ + ****************************************************************************/ /** * Initialize the widget with ignored packages @@ -103,27 +104,26 @@ */ define void InitSWRichText (string id) { - string sw_selection = KiwiConfig["sw_selection"]:"image"; - string pattern_key = sw_selection == "image" ? "addons" : (sw_selection + "_patterns"); + integer package_set = KiwiConfig["package_set"]:0; string rt = ""; - if (KiwiConfig[pattern_key]:[] != []) - { + + list packages = KiwiConfig["packages"]:[]; + string pat = ""; + string pac = ""; + + if (size (packages[package_set,"opensusePattern"]:[]) > 0) // richtext header - rt = Summary::AddHeader ("", _("Patterns")); - foreach (string pattern, (list<string>) KiwiConfig[pattern_key]:[], { - rt = Summary::AddListItem (rt, pattern); - }); - } - string package_key = sw_selection == "image" ? "packages" : (sw_selection + "_packages"); - if (KiwiConfig[package_key]:[] != []) - { + pat = Summary::AddHeader ("", _("Patterns")); + foreach (map patmap, packages[package_set,"opensusePattern"]:[], { + pat = Summary::AddListItem (pat, patmap["name"]:""); + }); + if (size (packages[package_set,"package"]:[]) > 0) // richtext header - rt = Summary::AddHeader (rt, _("Packages")); - foreach (string package, (list<string>) KiwiConfig[package_key]:[], { - rt = Summary::AddListItem (rt, package); - }); - } - UI::ChangeWidget (`id (id), `Value, rt); + pac = Summary::AddHeader ("", _("Packages")); + foreach (map pacmap, packages[package_set,"package"]:[], { + pac = Summary::AddListItem (pac, pacmap["name"]:""); + }); + UI::ChangeWidget (`id (id), `Value, pat + pac); } /** @@ -132,42 +132,34 @@ define symbol HandleSWSelection (string key, map event) { if (event["ID"]:nil == key) { - string sw_selection = KiwiConfig["sw_selection"]:"image"; + integer package_set = KiwiConfig["package_set"]:0; + map sw_contents = KiwiConfig["packages",package_set]:$[]; integer mbytes = (integer) UI::QueryWidget (`id ("size"), `Value); if (UI::QueryWidget (`id ("sizeunit"), `Value) == "G") mbytes = mbytes * 1024; ProductCreator::max_size_mb = mbytes; - if (sw_selection == "image" && packageSelector () != `cancel) - { - KiwiConfig["addons"] = ProductCreator::Config["addons"]:[]; - KiwiConfig["packages"] = ProductCreator::Config["packages"]:[]; - InitSWRichText ("rt_sw"); - if (ProductCreator::Config["taboo"]:[] != nil) - { - //FIXME do not replace current 'ignored' tags... - KiwiConfig["ignore"] = union (KiwiConfig["ignore"]:[], - ProductCreator::Config["taboo"]:[]); - InitSWIgnore ("ignore"); - } - } - else if (sw_selection != "image") - { - map<string,any> selected = runPackageSelector ("", - KiwiConfig[sw_selection + "_patterns"]:[], - KiwiConfig[sw_selection + "_packages"]:[], - KiwiConfig[sw_selection + "_ignore"]:[], - `packages - ); - KiwiConfig[sw_selection + "_patterns"] = selected["addons"]:[]; - KiwiConfig[sw_selection + "_packages"] = selected["packages"]:[]; - InitSWRichText ("rt_sw"); - if (ProductCreator::Config["taboo"]:[] != nil) - { - KiwiConfig["ignore"] = ProductCreator::Config["taboo"]:[]; - InitSWIgnore ("ignore"); - } - } + + map<string,any> ret_map = runPackageSelector ("", + maplist (map pat, sw_contents["opensusePattern"]:[], + ``(pat["name"]:"")), + maplist (map pat, sw_contents["package"]:[], + ``(pat["name"]:"")), + maplist (map pat, sw_contents["ignore"]:[], + ``(pat["name"]:"")), + `packages + ); + if (ret_map["ui"]:nil == `cancel) + return nil; + sw_contents["opensusePattern"] = maplist (string patname, + ret_map["addons"]:[], ``($[ "name" : patname])); + sw_contents["package"] = maplist (string patname, + ret_map["packages"]:[], ``($[ "name" : patname])); + sw_contents["ignore"] = maplist (string patname, + ret_map["taboo"]:[], ``($[ "name" : patname])); + KiwiConfig["packages",package_set] = sw_contents; + InitSWRichText ("rt_sw"); +// InitSWIgnore ("ignore"); FIXME } return nil; } @@ -176,21 +168,34 @@ * initialize the combo box with package selection groups */ define void InitSWSelectionCombo (string id) { - string sw_selection = KiwiConfig["sw_selection"]:"image"; - list items = [ - `item (`id ("image"), _("Image"), sw_selection == "image"), - ]; - if (kiwi_task == "xen") - items = add (items, `item (`id ("xen"), _("Xen Specific"), sw_selection == "xen")); + integer package_set = KiwiConfig["package_set"]:0; + list items = []; + integer i = 0; + foreach (map pmap, KiwiConfig["packages"]:[], { + string type = pmap["type"]:""; + // combo box label + string label = _("Image"); + if (type == "bootstrap") + // combo box label + label = _("Bootstrap"); + if (type == "xen") + // combo box label + label = _("Xen Specific"); // FIXME labels... + if (pmap["profiles"]:"" != "") + // combo box label, %1 is profile name + label = sformat (_("Image, profile %1"), pmap["profiles"]:""); + items = add (items, `item (`id (i), label, package_set == i)); + i = i + 1; + }); UI::ChangeWidget (`id (id), `Items, items); } define void StoreSWSelectionCombo (string key, map event) { - KiwiConfig[key] = (string) UI::QueryWidget(`id(key), `Value); + KiwiConfig["package_set"] = (integer) UI::QueryWidget(`id(key), `Value); } /** - * handler for combo box with isoboot items + * handler for combo box with package sets items */ define symbol HandleSWSelectionCombo (string key, map event) { any id = event["ID"]:nil; @@ -198,13 +203,13 @@ if (id == `next) StoreSWSelectionCombo (key, event); else if (event["ID"]:nil == key) { - string selected = (string) UI::QueryWidget(`id(key), `Value); - if (selected != KiwiConfig["sw_selection"]:"image") + integer selected = (integer) UI::QueryWidget(`id(key), `Value); + if (selected != KiwiConfig["package_set"]:0) { - StoreSWIgnore ("ignore", event); +// StoreSWIgnore ("ignore", event); FIXME StoreSWSelectionCombo (key, event); InitSWRichText ("rt_sw"); - InitSWIgnore ("ignore"); +// InitSWIgnore ("ignore"); FIXME } } return nil; @@ -838,9 +843,10 @@ map label2boot = $[ "openSUSE 10.2" : "suse-10.2", "openSUSE 10.3" : "suse-10.3", + "openSUSE 11.0" : "suse-11.0", "SUSE Linux 10.1" : "suse-10.1", "SUSE Linux Enterprise Server 10" : "suse-SLES10", - "SUSE Linux Enterprise Desktop 10" : "suse-SLED10" + "SUSE Linux Enterprise Desktop 10" : "suse-SLED10", ]; map distproduct2boot = $[ "openSUSE-10.2-CD-download" : "suse-10.2", @@ -884,9 +890,9 @@ } - /******************************************************************************************** + /**************************************************************************** * widget descriptions - *******************************************************************************************/ + ****************************************************************************/ // return map with description of tabs // it is a function, to be able to adapt to actual state (e.g. boot_image_widget ()) @@ -901,23 +907,39 @@ `VSpacing (0.2), `HBox ( `HWeight (1, "version"), - `HWeight (1, `HBox ("size", "sizeunit")) + `HWeight (1, `HBox ("size", "sizeunit")), + `VBox ( + `Label (""), "compressed" + ) ), + /* "sw_selection", `HBox ( `HWeight (1, `VBox ( - `Left (`Label (_("Installed Software"))), "rt_sw", `Right ("configure_sw") + `Left (`Label (_("Installed Software"))), + "rt_sw", `Right ("configure_sw") + )) +// `HWeight (1, `VBox ("ignore", "delete_sw")) + ), + */ + `HBox ( + `HWeight (2, `VBox ( + "sw_selection", + `Left (`Label (_("Installed Software"))), + "rt_sw", + `Right ("configure_sw") )), - `HWeight (1, `VBox ("ignore", "delete_sw")) + `HWeight (1, "delete_sw") ), `VSpacing (0.2) ), `HSpacing(1)), "widget_names" : [ "version", - "size", "sizeunit", + "size", "sizeunit", "compressed", "sw_selection", "rt_sw", "configure_sw", - "ignore", "delete_sw" + "delete_sw", +// "ignore", "delete_sw" ], ], "description" : $[ @@ -1006,79 +1028,6 @@ "no_help" : true, ], // widgets for config.xml tab - /* - "isoboot" : $[ - "widget" : `combobox, - "opt" : [ `hstretch, `notify ], - // combo box label - "label" : _("C&D Boot Image"), - // help text for "C&D Boot Image", %1/%2 is path (on extra line) - "help" : sformat (_("Choose one CD Boot Image from the -<tt>%1/%2</tt> -directory. -"), - Kiwi::kiwi_dir, boot_image_widget ()), - "items" : [], - "init" : InitBootCombo, - "store" : StoreBootCombo, - "handle" : HandleBootCombo, - ], - "xenboot" : $[ - "widget" : `combobox, - "opt" : [ `hstretch, `notify ], - // combo box label - "label" : _("&Xen Boot Image"), - // help text for "XEN Boot Image" - "help" : sformat (_("Choose one Xen Boot Image from the -<tt>%1/%2</tt> -directory. -"), - Kiwi::kiwi_dir, boot_image_widget ()), - "items" : [], - "init" : InitBootCombo, - "store" : StoreBootCombo, - "handle" : HandleBootCombo, - ], - "usbboot" : $[ - "widget" : `combobox, - "opt" : [ `hstretch, `notify ], - // combo box label - "label" : _("&USB Stick Boot Image"), - // help text for "XEN Boot Image" - "help" : sformat (_("Choose one USB Stick Boot Image from the -<tt>%1/%2</tt> -directory. -"), - Kiwi::kiwi_dir, boot_image_widget ()), - "items" : [], - "init" : InitBootCombo, - "store" : StoreBootCombo, - "handle" : HandleBootCombo, - ], - "vmxboot" : $[ - "widget" : `combobox, - "opt" : [ `hstretch, `notify ], - // combo box label - "label" : _("&Virtual Disk Boot Image"), - // help text for "XEN Boot Image" - "help" : sformat (_("Choose one Virtual Disk Boot Image from the -<tt>%1/%2</tt> -directory. -"), - Kiwi::kiwi_dir, boot_image_widget ()), - "items" : [], - "init" : InitBootCombo, - "store" : StoreBootCombo, - "handle" : HandleBootCombo, - ], - */ - "configure_boot" : $[ - "widget" : `push_button, - // pusbutton label - "label" : _("C&onfigure..."), - "help" : _("Create a new boot image with Configure."), - "handle" : NotImplementedHandler - ], "compressed" : $[ "widget" : `checkbox, // textentry label @@ -1088,6 +1037,7 @@ "store" : StoreCompressCheckBox, "handle" : HandleCompressCheckBox, ], + /* "sw_selection" : kiwi_task == "xen" ? $[ "widget" : `combobox, "opt" : [ `hstretch, `notify ], @@ -1103,6 +1053,19 @@ "widget" : `empty, "no_help" : true, ], + */ + "sw_selection" : $[ + "widget" : `combobox, + "opt" : [ `hstretch, `notify ], + // combo box label + "label" : _("So&ftware Selection"), + // help text for "So&ftware selection" + "help" : "", + "items" : [], + "init" : InitSWSelectionCombo, + "store" : StoreSWSelectionCombo, + "handle" : HandleSWSelectionCombo, + ], "rt_sw" : $[ "widget" : `richtext, "init" : InitSWRichText, @@ -1725,7 +1688,7 @@ if (template_items != []) UI::ChangeWidget (`id (`template), `Enabled, false); UI::ChangeWidget (`id (`import), `Enabled, false); - UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum () + "-_"); + UI::ChangeWidget (`id (`config), `ValidChars, String::CAlnum ()+".-_"); } any ret = nil; while (true) @@ -1924,6 +1887,7 @@ kiwi_task = (string) UI::QueryWidget (`id (`type), `Value); list<string> failed_repositories = []; + map<string,map> new_repositories = $[]; if (size (repositories) > 0) { map<string,integer> current_sources = $[]; @@ -1935,7 +1899,7 @@ current_sources[url] = srcid; }); // initialize new repos now - repositories = filter (string url, map repo, repositories, { + new_repositories = filter (string url, map repo, repositories, { if (substring (url, 0, 1) == "/") url = "dir://" + url; if (haskey (current_sources, url)) @@ -1968,7 +1932,26 @@ Continue anyway?"), mergestring (failed_repositories, "\n")))) { - update_repo_table (); + continue; + } + else + { + 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; } } Modified: trunk/product-creator/yast2-product-creator.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/yast2-product-cr… ============================================================================== --- trunk/product-creator/yast2-product-creator.spec.in (original) +++ trunk/product-creator/yast2-product-creator.spec.in Fri Mar 28 16:26:02 2008 @@ -10,9 +10,9 @@ # SourceDialogs::IsPlainDir() Requires: yast2-packager >= 2.16.20 -# GPG.ycp and GPGWidgets.ycp -Requires: yast2 >= 2.15.2 -BuildRequires: yast2 >= 2.15.2 +# ag_anyxml with perl-XML-Simple +Requires: yast2 >= 2.16.40 +BuildRequires: yast2 >= 2.16.40 # New API of StorageDevices.ycp Conflicts: yast2-storage < 2.16.1 -- 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] r45851 - /branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes
by ug＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: ug Date: Fri Mar 28 16:22:44 2008 New Revision: 45851 URL: http://svn.opensuse.org/viewcvs/yast?rev=45851&view=rev Log: changelog fixed Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes Modified: branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/autoin… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/autoinstallation/package/autoyast2.changes Fri Mar 28 16:22:44 2008 @@ -14,7 +14,7 @@ ------------------------------------------------------------------- Tue Feb 26 12:33:13 CET 2008 - ug(a)suse.de -- mountby option got lost when reusing partitions (#364793) +- mountby option got lost when reusing partitions (bnc#364793) - 2.13.99 ------------------------------------------------------------------- -- 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] r45850 - /tags/branch-SLE-10-SP2-2_13_116/network/network/
by mzugec＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: mzugec Date: Fri Mar 28 16:06:07 2008 New Revision: 45850 URL: http://svn.opensuse.org/viewcvs/yast?rev=45850&view=rev Log: Created tag branch-SLE-10-SP2-2_13_116 for network Added: tags/branch-SLE-10-SP2-2_13_116/network/network/ - copied from r45849, branches/SuSE-SLE-10-SP2-Branch/network/ -- 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] r45849 - /branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes
by mzugec＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: mzugec Date: Fri Mar 28 16:04:43 2008 New Revision: 45849 URL: http://svn.opensuse.org/viewcvs/yast?rev=45849&view=rev Log: fix date in changelog Modified: branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes Modified: branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/networ… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes Fri Mar 28 16:04:43 2008 @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Tue Mar 25 18:42:18 CET 2008 - mzugec(a)suse.de +Tue Mar 28 16:42:18 CET 2008 - mzugec(a)suse.de - L3: wait specified seconds according /etc/install.inf.ConnectWait (bnc#363423) -- 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] r45848 - /trunk/extra-packages
by aschnell＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: aschnell Date: Fri Mar 28 15:25:13 2008 New Revision: 45848 URL: http://svn.opensuse.org/viewcvs/yast?rev=45848&view=rev Log: - added some extra packages for yast2-storage Modified: trunk/extra-packages Modified: trunk/extra-packages URL: http://svn.opensuse.org/viewcvs/yast/trunk/extra-packages?rev=45848&r1=4584… ============================================================================== --- trunk/extra-packages (original) +++ trunk/extra-packages Fri Mar 28 15:25:13 2008 @@ -265,6 +265,16 @@ yast2-storage:lvm2 // if lvm is used yast2-storage:ntfsprogs // if an ntfs filesystem needs resizing +yast2-storage:e2fsprogs +yast2-storage:reiserfs +yast2-storage:dosfstools +yast2-storage:jfsutils +yast2-storage:xfsprogs +yast2-storage:quota +yast2-storage:cryptsetup +yast2-storage:pam_mount +yast2-storage:yast2-iscsi-client +yast2-storage:yast2-multipath yast2-vm:install-initrd // installation initrd with linuxrc and libraries yast2-vm:kernel-xen // XEN kernel -- 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] r45847 - /branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp
by aschnell＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: aschnell Date: Fri Mar 28 15:01:54 2008 New Revision: 45847 URL: http://svn.opensuse.org/viewcvs/yast?rev=45847&view=rev Log: - added button to call multipath module Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp Fri Mar 28 15:01:54 2008 @@ -22,7 +22,8 @@ `VBox( `PushButton(`id(`rescan), "Rescan"), `PushButton(`id(`fstab), "Search for Fstab..."), - `PushButton(`id(`iscsi), "iSCSI...") + `PushButton(`id(`iscsi), _("Configure &iSCSI...")), + `PushButton(`id(`multipath), _("Configure &Multipath...")) ), `VStretch() ) @@ -72,6 +73,28 @@ } } } + else if (widget == `multipath) + { + boolean doit = true; + + if (!Storage::EqualBackupStates("expert-partitioner", "", true)) + { + // popup text + doit = Popup::YesNo(_("Calling Multipath configuration cancels all current changes. +Really call Multipath configuration?")); + } + + if (doit) + { + if (Package::InstallAll(["yast2-multipath"])) + { + WFM::call("multipath"); + RescanDisks(); + Storage::CreateTargetBackup("expert-partitioner"); + UpdateNavigationTree(`hd); + } + } + } } -- 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] r45846 - /tags/branch-SLE-10-SP2-2_13_14/dhcp-server/
by kmachalkova＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: kmachalkova Date: Fri Mar 28 14:55:37 2008 New Revision: 45846 URL: http://svn.opensuse.org/viewcvs/yast?rev=45846&view=rev Log: Created tag branch-SLE-10-SP2-2_13_14 for dhcp-server Added: tags/branch-SLE-10-SP2-2_13_14/dhcp-server/ - copied from r45845, branches/SuSE-SLE-10-SP2-Branch/dhcp-server/ -- 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] r45845 - in /branches/SuSE-SLE-10-SP2-Branch/dhcp-server: VERSION package/yast2-dhcp-server.changes src/dialogs2.ycp
by kmachalkova＠svn.opensuse.org 28 Mar '08

28 Mar '08

Author: kmachalkova Date: Fri Mar 28 14:54:49 2008 New Revision: 45845 URL: http://svn.opensuse.org/viewcvs/yast?rev=45845&view=rev Log: Marked strings for translation (#370860) Modified: branches/SuSE-SLE-10-SP2-Branch/dhcp-server/VERSION branches/SuSE-SLE-10-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/dialogs2.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/dhcp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/dhcp-s… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/dhcp-server/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/dhcp-server/VERSION Fri Mar 28 14:54:49 2008 @@ -1 +1 @@ -2.13.13 +2.13.14 Modified: branches/SuSE-SLE-10-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/dhcp-s… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/dhcp-server/package/yast2-dhcp-server.changes Fri Mar 28 14:54:49 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 28 14:47:23 CET 2008 - kmachalkova(a)suse.cz + +- i18n: Marked strings for translation (bnc#370860) +- 2.13.14 + +------------------------------------------------------------------- Mon Jun 11 10:48:16 CEST 2007 - kmachalkova(a)suse.cz - Merged changes from trunk back into SP2 branch (r35612:38374) Modified: branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/dialogs2.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/dhcp-s… ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/dialogs2.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/dhcp-server/src/dialogs2.ycp Fri Mar 28 14:54:49 2008 @@ -1871,7 +1871,7 @@ ], "other_options" : $[ "widget" : `custom, - "custom_widget" : `TextEntry (`id("other_opts"), "DHCP Server Start-Up Arguments"), + "custom_widget" : `TextEntry (`id("other_opts"), _("DHCP Server Start-Up Arguments")), "init" : OtherOptionsInit, "validate_type" : `function, "validate_function" : OtherOptionsValidate, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
76
Older →

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

YaST Commits March 2008