Author: jsuchome
Date: Tue Sep 25 09:28:29 2007
New Revision: 41070
URL: http://svn.opensuse.org/viewcvs/yast?rev=41070&view=rev
Log:
- do not close module after kiwi failure (#327593)
- check stderr and stdout after kiwi finish/failure (#327610)
- count the maximum size in package selector (#327901)
- kiwi.ycp requires kiwi-desc-*boot
- simpler kiwi template for iso
- 2.15.8
Modified:
trunk/product-creator/VERSION
trunk/product-creator/package/yast2-product-creator.changes
trunk/product-creator/src/Kiwi.ycp
trunk/product-creator/src/ProductCreator.ycp
trunk/product-creator/src/complex.ycp
trunk/product-creator/src/data/kiwi_templates/iso/config.xml
trunk/product-creator/src/dialogs.ycp
trunk/product-creator/src/kiwi.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=41070&r1=41069&r2=41070&view=diff
==============================================================================
--- trunk/product-creator/VERSION (original)
+++ trunk/product-creator/VERSION Tue Sep 25 09:28:29 2007
@@ -1 +1 @@
-2.15.7
+2.15.8
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=41070&r1=41069&r2=41070&view=diff
==============================================================================
--- trunk/product-creator/package/yast2-product-creator.changes (original)
+++ trunk/product-creator/package/yast2-product-creator.changes Tue Sep 25 09:28:29 2007
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Mon Sep 24 08:44:56 CEST 2007 - jsuchome@suse.cz
+
+- do not close module after kiwi failure (#327593)
+- check stderr and stdout after kiwi finish/failure (#327610)
+- count the maximum size in package selector (#327901)
+- kiwi.ycp requires kiwi-desc-*boot
+- simpler kiwi template for iso
+- 2.15.8
+
+-------------------------------------------------------------------
Sun Sep 2 21:20:26 CEST 2007 - jsuchome@suse.cz
- write schemeversion to config.xml
Modified: trunk/product-creator/src/Kiwi.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev=41070&r1=41069&r2=41070&view=diff
==============================================================================
--- trunk/product-creator/src/Kiwi.ycp (original)
+++ trunk/product-creator/src/Kiwi.ycp Tue Sep 25 09:28:29 2007
@@ -465,18 +465,10 @@
return false;
}
- /* rather do not remove, filesystem can be mounted
if (FileUtils::Exists (tmp_dir + "/myphysical"))
{
SCR::Execute (.target.bash, sformat ("rm -rf %1/myphysical", tmp_dir));
}
- */
-
- string cmd = sformat ("kiwi --root %1/myphysical --prepare %2 --logfile terminal", tmp_dir, config_dir);
-
- y2milestone ("calling '%1'", cmd);
-
- SCR::Execute (.background.run_output_err, cmd);
// construct the dialog
UI::OpenDialog(`opt(`decorated), `HBox(`HSpacing(1.5),
@@ -499,6 +491,27 @@
), `HSpacing(1.5)
));
+ void update_output () {
+ // read the output line from irw:
+ list<string> out = (list<string>)SCR::Read(.background.newout);
+ foreach (string line, out, {
+ line = String::Replace (line, "\r", "\n");
+ UI::ChangeWidget (`id(`log), `LastLine, line + "\n");
+ });
+
+ list<string> err = (list<string>) SCR::Read(.background.newerr);
+ foreach (string line, err, {
+ line = String::Replace (line, "\r", "\n");
+ UI::ChangeWidget (`id(`errlog), `LastLine, line + "\n");
+ });
+ }
+
+ string cmd = sformat ("kiwi --root %1/myphysical --prepare %2 --logfile terminal", tmp_dir, config_dir);
+
+ y2milestone ("calling '%1'", cmd);
+
+ SCR::Execute (.background.run_output_err, cmd);
+
symbol ret = nil;
boolean creating = false;
do
@@ -507,21 +520,12 @@
if ((boolean) SCR::Read(.background.output_open) &&
(integer) SCR::Read(.background.newlines)>0)
{
- // read the output line from irw:
- list<string> out = (list<string>)SCR::Read(.background.newout);
- foreach (string line, out, {
- line = String::Replace (line, "\r", "\n");
- UI::ChangeWidget (`id(`log), `LastLine, line + "\n");
- });
-
- list<string> err = (list<string>) SCR::Read(.background.newerr);
- foreach (string line, err, {
- line = String::Replace (line, "\r", "\n");
- UI::ChangeWidget (`id(`errlog), `LastLine, line + "\n");
- });
+ update_output ();
}
else if (!(boolean)SCR::Read(.background.isrunning))
{
+ update_output ();
+
integer status = (integer) SCR::Read (.background.status);
if (status != 0)
{
Modified: trunk/product-creator/src/ProductCreator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreator.ycp?rev=41070&r1=41069&r2=41070&view=diff
==============================================================================
--- trunk/product-creator/src/ProductCreator.ycp (original)
+++ trunk/product-creator/src/ProductCreator.ycp Tue Sep 25 09:28:29 2007
@@ -62,6 +62,7 @@
global boolean profile_parsed = false;
+global integer max_size_mb = 999 * 1024;
/* Configuration Map */
global map Config = $[];
Modified: trunk/product-creator/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?rev=41070&r1=41069&r2=41070&view=diff
==============================================================================
--- trunk/product-creator/src/complex.ycp (original)
+++ trunk/product-creator/src/complex.ycp Tue Sep 25 09:28:29 2007
@@ -169,7 +169,7 @@
break;
}
else if(ret == `iso_button &&
- Package::InstallAll (["kiwi", "kiwi-desc-isoboot", "kiwi-desc-livesystem"])) {
+ Package::InstallAll (["kiwi", "kiwi-desc-isoboot"])) {
string current = (string) UI::QueryWidget(`id(`table), `CurrentItem);
ProductCreator::Config = ProductCreator::Configs[current]:$[];
ProductCreator::kiwi_task = "iso";
@@ -177,7 +177,7 @@
break;
}
else if (ret == `xen_button &&
- Package::InstallAll (["kiwi", "kiwi-desc-xenboot", "kiwi-desc-buildservice"])) {
+ Package::InstallAll (["kiwi", "kiwi-desc-xenboot"])) {
string current = (string) UI::QueryWidget(`id(`table), `CurrentItem);
ProductCreator::Config = ProductCreator::Configs[current]:$[];
ProductCreator::kiwi_task = "xen";
@@ -185,7 +185,7 @@
break;
}
else if (ret == `usb_button &&
- Package::InstallAll (["kiwi", "kiwi-desc-usbboot", "kiwi-desc-livesystem"])) {
+ Package::InstallAll (["kiwi", "kiwi-desc-usbboot"])) {
string current = (string) UI::QueryWidget(`id(`table), `CurrentItem);
ProductCreator::Config = ProductCreator::Configs[current]:$[];
ProductCreator::kiwi_task = "usb";
@@ -193,7 +193,7 @@
break;
}
else if (ret == `vmx_button &&
- Package::InstallAll (["kiwi", "kiwi-desc-vmxboot", "kiwi-desc-livesystem"])) {
+ Package::InstallAll (["kiwi", "kiwi-desc-vmxboot"])) {
string current = (string) UI::QueryWidget(`id(`table), `CurrentItem);
ProductCreator::Config = ProductCreator::Configs[current]:$[];
ProductCreator::kiwi_task = "vmx";
Modified: trunk/product-creator/src/data/kiwi_templates/iso/config.xml
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_templates/iso/config.xml?rev=41070&r1=41069&r2=41070&view=diff
==============================================================================
--- trunk/product-creator/src/data/kiwi_templates/iso/config.xml (original)
+++ trunk/product-creator/src/data/kiwi_templates/iso/config.xml Tue Sep 25 09:28:29 2007
@@ -11,13 +11,10 @@
<rpm-force>True</rpm-force>
</preferences>
<packages type="image" patternType="plusRecommended">
- <package name="subversion"/>
<package name="xkeyboard-config"/>
<opensusePattern name="default"/>
<opensusePattern name="base"/>
<opensusePattern name="x11"/>
- <opensusePattern name="apparmor"/>
- <opensusePattern name="kde"/>
<ignore name="smtp_daemon"/>
<ignore name="pfscalibratio"/>
<ignore name="jaf-demo"/>
Modified: trunk/product-creator/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?rev=41070&r1=41069&r2=41070&view=diff
==============================================================================
--- trunk/product-creator/src/dialogs.ycp (original)
+++ trunk/product-creator/src/dialogs.ycp Tue Sep 25 09:28:29 2007
@@ -876,7 +876,10 @@
any ret = nil;
// set a mount point - there is no use to display DU of the current system
- Pkg::TargetInitDU([ $[ "name" : "/", "free" : 999*1024*1024 /* 999GB */, "used" : 0, "readonly" : false ] ]);
+ Pkg::TargetInitDU([ $[ "name" : "/",
+ "free" : ProductCreator::max_size_mb * 1024,
+ "used" : 0, "readonly" : false ]
+ ]);
/* dialog caption */
string caption = _("Software Selection");
Modified: trunk/product-creator/src/kiwi.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi.ycp?rev=41070&r1=41069&r2=41070&view=diff
==============================================================================
--- trunk/product-creator/src/kiwi.ycp (original)
+++ trunk/product-creator/src/kiwi.ycp Tue Sep 25 09:28:29 2007
@@ -50,8 +50,11 @@
return false;
}
- if (!Package::InstallAll (["kiwi", "yast2-instserver"]))
+ // not necessary to install all kiwi-descs, but now we don't know
+ // which will be needed...
+ if (!Package::InstallAll (["kiwi", "yast2-instserver", "kiwi-desc-isoboot", "kiwi-desc-xenboot", "kiwi-desc-usbboot", "kiwi-desc-vmxboot"]))
{
+ // error popup
Popup::Error(_("Installation of required packages
failed."));
return false;
Modified: trunk/product-creator/src/kiwi_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=41070&r1=41069&r2=41070&view=diff
==============================================================================
--- trunk/product-creator/src/kiwi_dialogs.ycp (original)
+++ trunk/product-creator/src/kiwi_dialogs.ycp Tue Sep 25 09:28:29 2007
@@ -114,6 +114,11 @@
if (event["ID"]:nil == key)
{
string sw_selection = KiwiConfig["sw_selection"]:"image";
+
+ 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"]:[];
@@ -623,7 +628,7 @@
define boolean CreateImage (string key, map event) {
if (event["ID"]:nil != `next)
return true;
-
+ boolean ret = true;
map question = $[
// popup question
"iso" : _("Create ISO image now?"),
@@ -677,6 +682,10 @@
Popup::Message (sformat (success[kiwi_task]:"", out_dir));
}
}
+ else
+ {
+ ret = false;
+ }
}
}
string dir = Kiwi::SaveConfiguration (KiwiConfig, kiwi_task);
@@ -684,7 +693,7 @@
{
ProductCreator::Config["kiwi_configuration_" + kiwi_task] = dir;
}
- return true;
+ return ret;
}
/**
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
