Hello community, here is the log from the commit of package yast2-product-creator checked in at Tue Sep 25 21:32:37 CEST 2007. -------- --- yast2-product-creator/yast2-product-creator.changes 2007-09-14 12:40:01.000000000 +0200 +++ /mounts/work_src_done/NOARCH/NOARCH/yast2-product-creator/yast2-product-creator.changes 2007-09-25 09:27:45.575865000 +0200 @@ -1,0 +2,10 @@ +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 + +------------------------------------------------------------------- Old: ---- yast2-product-creator-2.15.7.tar.bz2 New: ---- yast2-product-creator-2.15.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.j13660/_old 2007-09-25 21:32:16.000000000 +0200 +++ /var/tmp/diff_new_pack.j13660/_new 2007-09-25 21:32:16.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-product-creator (Version 2.15.7) +# spec file for package yast2-product-creator (Version 2.15.8) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-product-creator -Version: 2.15.7 +Version: 2.15.8 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.15.7.tar.bz2 +Source0: yast2-product-creator-2.15.8.tar.bz2 Prefix: /usr BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2-devtools yast2-packager yast2-security yast2-testsuite Requires: yast2-packager autoyast2-installation yast2-security @@ -33,7 +33,7 @@ %prep -%setup -n yast2-product-creator-2.15.7 +%setup -n yast2-product-creator-2.15.8 %build %{prefix}/bin/y2tool y2autoconf @@ -74,8 +74,14 @@ #%dir /etc/YaST2/product-creator /usr/share/YaST2/scrconf/*.scr /usr/lib/YaST2/servers_non_y2/ag_* - %changelog +* Mon Sep 24 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 02 2007 - jsuchome@suse.cz - write schemeversion to config.xml - save new kiwi image configurations to vardir/product-creator ++++++ yast2-product-creator-2.15.7.tar.bz2 -> yast2-product-creator-2.15.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.7/src/complex.ycp new/yast2-product-creator-2.15.8/src/complex.ycp --- old/yast2-product-creator-2.15.7/src/complex.ycp 2007-09-13 09:36:17.000000000 +0200 +++ new/yast2-product-creator-2.15.8/src/complex.ycp 2007-09-24 09:01:42.000000000 +0200 @@ -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"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.7/src/data/kiwi_templates/iso/config.xml new/yast2-product-creator-2.15.8/src/data/kiwi_templates/iso/config.xml --- old/yast2-product-creator-2.15.7/src/data/kiwi_templates/iso/config.xml 2007-09-14 10:04:26.000000000 +0200 +++ new/yast2-product-creator-2.15.8/src/data/kiwi_templates/iso/config.xml 2007-09-24 16:29:11.000000000 +0200 @@ -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"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.7/src/dialogs.ycp new/yast2-product-creator-2.15.8/src/dialogs.ycp --- old/yast2-product-creator-2.15.7/src/dialogs.ycp 2007-09-13 09:36:17.000000000 +0200 +++ new/yast2-product-creator-2.15.8/src/dialogs.ycp 2007-09-25 08:36:21.000000000 +0200 @@ -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"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.7/src/kiwi_dialogs.ycp new/yast2-product-creator-2.15.8/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.15.7/src/kiwi_dialogs.ycp 2007-09-13 11:20:10.000000000 +0200 +++ new/yast2-product-creator-2.15.8/src/kiwi_dialogs.ycp 2007-09-25 08:35:07.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs for kiwi configuration * Authors: Jiri Suchomel <jsuchome@suse.cz> * - * $Id: kiwi_dialogs.ycp 40494 2007-08-27 10:13:26Z jsuchome $ + * $Id: kiwi_dialogs.ycp 40913 2007-09-14 10:40:26Z jsuchome $ */ { textdomain "product-creator"; @@ -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; } /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.7/src/kiwi.ycp new/yast2-product-creator-2.15.8/src/kiwi.ycp --- old/yast2-product-creator-2.15.7/src/kiwi.ycp 2007-09-13 13:31:37.000000000 +0200 +++ new/yast2-product-creator-2.15.8/src/kiwi.ycp 2007-09-24 15:07:33.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Client to start the kiwi UI * Authors: Jiri Suchomel <jsuchome@suse.cz> * - * $Id: kiwi.ycp 39527 2007-07-19 11:52:47Z jsuchome $ + * $Id: kiwi.ycp 40913 2007-09-14 10:40:26Z jsuchome $ * */ @@ -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; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.7/src/Kiwi.ycp new/yast2-product-creator-2.15.8/src/Kiwi.ycp --- old/yast2-product-creator-2.15.7/src/Kiwi.ycp 2007-09-14 10:12:48.000000000 +0200 +++ new/yast2-product-creator-2.15.8/src/Kiwi.ycp 2007-09-24 08:54:07.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for kiwi configuration, input and output functions. * Authors: Jiri Suchomel <jsuchome@suse.cz> * - * $Id: Kiwi.ycp 40494 2007-08-27 10:13:26Z jsuchome $ + * $Id: Kiwi.ycp 40913 2007-09-14 10:40:26Z jsuchome $ */ { module "Kiwi"; @@ -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) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.7/src/ProductCreator.ycp new/yast2-product-creator-2.15.8/src/ProductCreator.ycp --- old/yast2-product-creator-2.15.7/src/ProductCreator.ycp 2007-09-13 09:36:17.000000000 +0200 +++ new/yast2-product-creator-2.15.8/src/ProductCreator.ycp 2007-09-25 08:35:41.000000000 +0200 @@ -62,6 +62,7 @@ global boolean profile_parsed = false; +global integer max_size_mb = 999 * 1024; /* Configuration Map */ global map<string, any> Config = $[]; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.15.7/VERSION new/yast2-product-creator-2.15.8/VERSION --- old/yast2-product-creator-2.15.7/VERSION 2007-09-02 21:20:58.000000000 +0200 +++ new/yast2-product-creator-2.15.8/VERSION 2007-09-24 08:46:27.000000000 +0200 @@ -1 +1 @@ -2.15.7 +2.15.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠Hilbert.suse.de