[yast-commit] r63568 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/complex.ycp src/kiwi_dialogs.ycp

Author: jsuchome Date: Fri Mar 11 15:11:21 2011 New Revision: 63568 URL: http://svn.opensuse.org/viewcvs/yast?rev=63568&view=rev Log: - allow live iso creation only for x86/x86_64 (bnc#678145) - show repository names in package selector (bnc#618251) - 2.21.1 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes 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=63568&r1=63567&r2=63568&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Fri Mar 11 15:11:21 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 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=63568&r1=63567&r2=63568&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Fri Mar 11 15:11:21 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Mar 11 15:07:59 CET 2011 - jsuchome@suse.cz + +- allow live iso creation only for x86/x86_64 (bnc#678145) +- show repository names in package selector (bnc#618251) +- 2.21.1 + +------------------------------------------------------------------- Fri Mar 4 14:26:18 CET 2011 - jsuchome@suse.cz - strip UTF-8 ending from locale string (bnc#675101) Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?rev=63568&r1=63567&r2=63568&view=diff ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Fri Mar 11 15:11:21 2011 @@ -134,6 +134,23 @@ `header(_("Name"), _("Product"), _("Image"), _("GPG Key")), overview, nil, nil, nil, nil ); + list<term> menubutton_items = [ + // push button label + `item(`id(`xen_button), _("Xen Image")), + // push button label + `item(`id(`usb_button), _("USB Stick Image")), + // push button label + `item(`id(`vmx_button), _("Virtual Disk Image")), + ]; + // build Live iso only for x86_64 and i386 (bnc#675101) + if (Arch::architecture () == "x86_64" || ProductCreator::GetArch () == "i386") + { + menubutton_items = prepend (menubutton_items, + // push box item + `item(`id(`iso_button), _("Live ISO Image")) + ); + } + term contents2 = `VBox( contents, `HBox ( @@ -145,16 +162,7 @@ `item(`id(`create_tree_button), _("Directory Tree")) ]), // menu button label - `MenuButton (`id (`kiwi), _("Cre&ate Image with KIWI..."), [ - // push button label - `item(`id(`iso_button), _("Live ISO Image")), - // push button label - `item(`id(`xen_button), _("Xen Image")), - // push button label - `item(`id(`usb_button), _("USB Stick Image")), - // push button label - `item(`id(`vmx_button), _("Virtual Disk Image")), - ]) + `MenuButton (`id (`kiwi), _("Cre&ate Image with KIWI..."), menubutton_items) ) ); Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=63568&r1=63567&r2=63568&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Fri Mar 11 15:11:21 2011 @@ -2504,6 +2504,7 @@ repositories[url] = $[ "url" : url, "plaindir" : plaindir, + "name" : SourceDialogs::GetRepoName () ]; update_repo_table (); } @@ -2532,7 +2533,8 @@ plaindir = SourceDialogs::IsPlainDir(); repositories[url] = $[ "url" : url, - "plaindir" : plaindir + "plaindir" : plaindir, + "name" : SourceDialogs::GetRepoName () ]; update_repo_table (); } @@ -2624,8 +2626,16 @@ integer srcid = source["SrcId"]:-1; map data = Pkg::SourceGeneralData (srcid); string url = data["url"]:""; + // there can be more sources with same url, leave there only one + if (current_sources[url]:srcid != srcid) + { + y2milestone ("deleting extra source %1 for %2", current_sources[url]:srcid, url); + Pkg::SourceDelete (current_sources[url]:srcid); + } current_sources[url] = srcid; }); + // map of new repo aliases + map aliases = $[]; // initialize new repos now new_repositories = filter (string url, map repo, repositories, { if (substring (url, 0, 1) == "/") @@ -2639,10 +2649,26 @@ string full_url = url; if (repo["full_url"]:"" != "" && repo["full_url"]:"" != url) full_url = repo["full_url"]:""; + + string alias = mergestring (splitstring (repo["name"]:full_url, " "), "_"); + if (aliases[alias]:0 > 0) + { + alias = sformat ("%1%2", alias, aliases[alias]:0); + } + aliases[alias] = aliases[alias]:0 + 1; + + map repo_map = $[ + "name" : repo["name"]:alias, + "alias" : alias, + "base_urls" : [ full_url ], + ]; + if (repo["plaindir"]:false) - source_ret = Pkg::SourceCreateType (full_url, "", "Plaindir"); - else - source_ret = Pkg::SourceCreate (full_url, ""); + { + repo_map["type"] = "Plaindir"; + } + source_ret = Pkg::RepositoryAdd (repo_map); + if (source_ret == -1) { failed_repositories = add (failed_repositories, url); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org