Merge pull request #18 from jsuchome/Code-11-SP3

- drop obsoleted usbboot image support (bnc#834664)
yast · Aug 21, 2013 · 2d5f36c · 2d5f36c
2 parents 1b6372c + 49d981f
commit 2d5f36c
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 35 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.17.57
+2.17.58
diff --git a/package/yast2-product-creator.changes b/package/yast2-product-creator.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug 21 09:22:22 CEST 2013 - jsuchome@suse.cz
+
+- drop obsoleted usbboot image support (bnc#834664)
+- enable all image types when not using the template (bnc#834845)
+- 2.17.58 
+
 -------------------------------------------------------------------
 Tue Dec 18 11:14:52 CET 2012 - jsuchome@suse.cz
 

diff --git a/src/complex.ycp b/src/complex.ycp
@@ -138,8 +138,6 @@ Kiwi cannot create images for different architectures."), arch, sysarch));
 		    // 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)
@@ -268,16 +266,6 @@ Kiwi cannot create images for different architectures."), arch, sysarch));
                 ret = `kiwi;
 		break;
 	    }
-	    else if (ret == `usb_button &&
-		Package::InstallAll (["kiwi", "kiwi-desc-usbboot"])) {
-                string current = (string) UI::QueryWidget(`id(`table), `CurrentItem);
-                ProductCreator::Config = ProductCreator::Configs[current]:$[];
-		// check the architecture
-		if (!SameArchitecture()) continue;
-		Kiwi::kiwi_task	= "usb";
-                ret = `kiwi;
-		break;
-	    }
 	    else if (ret == `vmx_button &&
 		Package::InstallAll (["kiwi", "kiwi-desc-vmxboot"])) {
                 string current = (string) UI::QueryWidget(`id(`table), `CurrentItem);

diff --git a/src/kiwi.ycp b/src/kiwi.ycp
@@ -53,7 +53,7 @@ define boolean ShortKiwiSequence() {
 
     // not necessary to install all kiwi-descs, but now we don't know
     // which will be needed...
-    if (!Package::InstallAll (["kiwi", "kiwi-desc-isoboot", "kiwi-desc-xenboot", "kiwi-desc-usbboot", "kiwi-desc-vmxboot"]))
+    if (!Package::InstallAll (["kiwi", "kiwi-desc-isoboot", "kiwi-desc-xenboot", "kiwi-desc-vmxboot"]))
     {
 	// error popup
         Popup::Error(_("Installation of required packages

diff --git a/src/kiwi_dialogs.ycp b/src/kiwi_dialogs.ycp
@@ -1371,8 +1371,6 @@ Going to detailed package selection and accepting the view without any further c
 	// popup question
 	"xen"	: _("Create Xen image now?"),
 	// popup question
-	"usb"	: _("Create USB stick image now?"),
-	// popup question
 	"vmx"	: _("Create virtual disk image now?"),
     ];
 
@@ -1386,10 +1384,6 @@ directory."),
 %1
 directory.
 "),
-	// popup message, %1 is a dir
-	"usb"	: _("USB stick image successfully created in
-%1
-directory."),
 	// popup message, %1 is a dir
 	"vmx"	: _("Virtual disk image successfully created in
 %1
@@ -1710,11 +1704,6 @@ directory."), out_dir));
     {
 	KiwiConfig["isoboot"]	= boot_image;
     }
-    else if (kiwi_task == "usb")
-    {
-	if (!haskey (KiwiConfig, "usbboot") && boot_image != "")
-	    KiwiConfig["usbboot"]	= boot_image;
-    }
     else if (kiwi_task == "vmx")
     {
 	if (!haskey (KiwiConfig, "vmxboot") && boot_image != "")
@@ -2312,8 +2301,6 @@ map caption		= $[
     "iso"	: _("Live CD Configuration"),
     // dialog caption
     "xen"	: _("Xen Image Configuration"),
-    // dialog caption
-    "usb"	: _("USB Stick Image Configuration"),
     // button label
     "vmx"	: _("Virtual Disk Image"),
 ];
@@ -2323,8 +2310,6 @@ map next_button	= $[
     // button label
     "xen"	: _("&Create Xen Image"),
     // button label
-    "usb"	: _("&Create USB Stick Image"),
-    // button label
     "vmx"	: _("&Create Virtual Disk Image"),
 ];
 symbol ret = CWM::ShowAndRun ($[
@@ -2385,8 +2370,6 @@ return ret;
 	    // combo box item
 	    `item (`id ("xen"), _("Xen Image"), kiwi_task == "xen"),
 	    // combo box item
-	    `item (`id ("usb"), _("USB Stick Image"), kiwi_task == "usb"),
-	    // combo box item
 	    `item (`id ("vmx"), _("Virtual Disk Image"), kiwi_task == "vmx")
     ];
 
@@ -2407,8 +2390,6 @@ return ret;
 	// combo box item
 	"xen"	: _("Xen Image"),
 	// combo box item
-	"usb"	: _("USB Stick Image"),
-	// combo box item
 	"vmx"	: _("Virtual Disk Image"),
 	// combo box item
 	"oem"	: _("OEM Image")
@@ -2445,7 +2426,7 @@ return ret;
     }
     list present_types	= maplist (
 	term it, (list<term>)type_items, ``(it[0,0]:""));
-    if (!contains (["iso", "xen", "usb", "vmx"], kiwi_task) &&
+    if (!contains (["iso", "xen", "vmx"], kiwi_task) &&
 	!contains (present_types, kiwi_task))
     {
 	type_items	= add (type_items,
@@ -2671,6 +2652,7 @@ return ret;
 	{
 	    UI::ChangeWidget (`id (`template), `Enabled, false);
 	    UI::ChangeWidget (`id (`import), `Enabled, false);
+            UI::ChangeWidget (`id (`type), `Items, default_type_items);
 	}
 	if (ret == `i386)
 	{
@@ -2940,7 +2922,7 @@ Continue anyway?"), mergestring (failed_repositories, "\n"))))
 		}
 	    }
 	    string to_install	= "";
-	    if (contains ([ "iso", "xen", "vmx", "usb" ], kiwi_task))
+	    if (contains ([ "iso", "xen", "vmx" ], kiwi_task))
 	    {
 		string bootdir	= get_bootdir (Config, kiwi_task);
 		if (bootdir == "" ||