Hello community, here is the log from the commit of package yast2-product-creator for openSUSE:Factory checked in at Mon Mar 14 11:00:56 CET 2011. -------- --- yast2-product-creator/yast2-product-creator.changes 2011-03-04 14:28:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-product-creator/yast2-product-creator.changes 2011-03-11 15:11:46.000000000 +0100 @@ -1,0 +2,7 @@ +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 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-product-creator-2.21.0.tar.bz2 New: ---- yast2-product-creator-2.21.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.YOE0vW/_old 2011-03-14 10:59:17.000000000 +0100 +++ /var/tmp/diff_new_pack.YOE0vW/_new 2011-03-14 10:59:17.000000000 +0100 @@ -19,11 +19,11 @@ Name: yast2-product-creator -Version: 2.21.0 +Version: 2.21.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.21.0.tar.bz2 +Source0: yast2-product-creator-2.21.1.tar.bz2 Prefix: /usr @@ -62,7 +62,7 @@ XEN images etc.), based on existing installation sources. %prep -%setup -n yast2-product-creator-2.21.0 +%setup -n yast2-product-creator-2.21.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-product-creator-2.21.0.tar.bz2 -> yast2-product-creator-2.21.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.21.0/VERSION new/yast2-product-creator-2.21.1/VERSION --- old/yast2-product-creator-2.21.0/VERSION 2011-03-04 14:26:34.000000000 +0100 +++ new/yast2-product-creator-2.21.1/VERSION 2011-03-11 15:10:45.000000000 +0100 @@ -1 +1 @@ -2.21.0 +2.21.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.21.0/src/complex.ycp new/yast2-product-creator-2.21.1/src/complex.ycp --- old/yast2-product-creator-2.21.0/src/complex.ycp 2010-04-29 18:03:39.000000000 +0200 +++ new/yast2-product-creator-2.21.1/src/complex.ycp 2011-03-11 15:06:50.000000000 +0100 @@ -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) ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-product-creator-2.21.0/src/kiwi_dialogs.ycp new/yast2-product-creator-2.21.1/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.21.0/src/kiwi_dialogs.ycp 2011-03-04 14:27:25.000000000 +0100 +++ new/yast2-product-creator-2.21.1/src/kiwi_dialogs.ycp 2011-03-04 14:29:50.000000000 +0100 @@ -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); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org