Author: jsuchome
Date: Fri Mar 11 15:59:44 2011
New Revision: 63570
URL: http://svn.opensuse.org/viewcvs/yast?rev=63570&view=rev
Log:
- allow live iso creation only for x86/x86_64 (bnc#678145)
- show repository names in package selector (bnc#618251)
- 2.17.38.2
Modified:
branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION
branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes
branches/SuSE-Code-11-SP1-Branch/product-creator/src/complex.ycp
branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp
Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION (original)
+++ branches/SuSE-Code-11-SP1-Branch/product-creator/VERSION Fri Mar 11 15:59:44 2011
@@ -1 +1 @@
-2.17.38.1
+2.17.38.2
Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes (original)
+++ branches/SuSE-Code-11-SP1-Branch/product-creator/package/yast2-product-creator.changes Fri Mar 11 15:59:44 2011
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Mar 11 15:09:41 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.17.38.2
+
+-------------------------------------------------------------------
Fri Mar 4 13:58:08 CET 2011 - jsuchome@suse.cz
- strip UTF-8 ending from locale string (bnc#675101)
Modified: branches/SuSE-Code-11-SP1-Branch/product-creator/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/product-creator/src/complex.ycp?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/product-creator/src/complex.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/complex.ycp Fri Mar 11 15:59:44 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: branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp?rev=63570&r1=63569&r2=63570&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Fri Mar 11 15:59:44 2011
@@ -2507,6 +2507,7 @@
repositories[url] = $[
"url" : url,
"plaindir" : plaindir,
+ "name" : SourceDialogs::GetRepoName ()
];
update_repo_table ();
}
@@ -2535,7 +2536,8 @@
plaindir = SourceDialogs::IsPlainDir();
repositories[url] = $[
"url" : url,
- "plaindir" : plaindir
+ "plaindir" : plaindir,
+ "name" : SourceDialogs::GetRepoName ()
];
update_repo_table ();
}
@@ -2627,8 +2629,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