Author: jsuchome
Date: Fri Sep 4 15:23:24 2009
New Revision: 58530
URL: http://svn.opensuse.org/viewcvs/yast?rev=58530&view=rev
Log:
- merge changes from SLE11:
fixed cross-architecture problems (bnc#510971)
Image Creator: help texts for locale configuration (bnc#515551)
do not create i386 version of initrd for s390 (bnc#498464)
do not re-crypt user password already crypted (bnc#521887)
show the warning when package management is locked (bnc#526338)
give kiwi more time to finish (bnc#525986)
probe repositories of NONE type (bnc#527198)
show error if removing old chroot failed (bnc#525993)
- 2.18.11
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/kiwi_dialogs.ycp
trunk/product-creator/src/wizards.ycp
Modified: trunk/product-creator/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=58530&r1=58529&r2=58530&view=diff
==============================================================================
--- trunk/product-creator/VERSION (original)
+++ trunk/product-creator/VERSION Fri Sep 4 15:23:24 2009
@@ -1 +1 @@
-2.18.10
+2.18.11
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=58530&r1=58529&r2=58530&view=diff
==============================================================================
--- trunk/product-creator/package/yast2-product-creator.changes (original)
+++ trunk/product-creator/package/yast2-product-creator.changes Fri Sep 4 15:23:24 2009
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Fri Sep 4 15:17:06 CEST 2009 - jsuchome@suse.cz
+
+- merge changes from SLE11:
+ fixed cross-architecture problems (bnc#510971)
+ Image Creator: help texts for locale configuration (bnc#515551)
+ do not create i386 version of initrd for s390 (bnc#498464)
+ do not re-crypt user password already crypted (bnc#521887)
+ show the warning when package management is locked (bnc#526338)
+ give kiwi more time to finish (bnc#525986)
+ probe repositories of NONE type (bnc#527198)
+ show error if removing old chroot failed (bnc#525993)
+- 2.18.11
+
+-------------------------------------------------------------------
Thu Sep 3 14:17:26 CEST 2009 - jsuchome@suse.cz
- added keywords to desktop files
Modified: trunk/product-creator/src/Kiwi.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev=58530&r1=58529&r2=58530&view=diff
==============================================================================
--- trunk/product-creator/src/Kiwi.ycp (original)
+++ trunk/product-creator/src/Kiwi.ycp Fri Sep 4 15:23:24 2009
@@ -131,6 +131,8 @@
string url = data["url"]:"";
if (url == source || url == adapt_source_path (source))
{
+ if (data["type"]:"" == "NONE")
+ data["type"] = Pkg::RepositoryProbe (url, "");
if (data["type"]:"" == "Plaindir")
type = "rpm-dir";
if (data["type"]:"" == "YUM")
@@ -391,6 +393,19 @@
return substring (full_path, 0, findlastof (full_path, "/"));
}
+ // wait until process is really done or kill -9 it after minute
+ void give_kiwi_time_to_finish (integer pid) {
+ integer count = 0;
+ while (SCR::Read(.process.running, pid) == true)
+ {
+ sleep(100);
+ count = count + 1;
+ if (count > 600) break;
+ }
+ if (SCR::Read(.process.running, pid) == true) SCR::Execute (.process.kill, pid);
+ }
+
+
/**
* run kiwi to finally create the selected image
* @param out_dir output directory for the result
@@ -410,7 +425,13 @@
if (FileUtils::Exists (chroot_dir))
{
y2milestone ("%1 directory is present, removing...", chroot_dir);
- SCR::Execute (.target.bash, sformat ("rm -rf %1", chroot_dir));
+ map out = (map) SCR::Execute (.target.bash_output, sformat ("rm -rf %1", chroot_dir));
+ if (out["exit"]:0 != 0)
+ {
+ y2warning ("cmd output: %1", out);
+ Report::Error (_("Removing old chroot directory failed.") + "\n\n" + out["stderr"]:"");
+ return false;
+ }
}
// create path to chroot_dir if it does not exist (#406731)
FileUtils::CheckAndCreatePath (path_to_dir (chroot_dir));
@@ -523,13 +544,13 @@
if (ret == `cancel)
{
SCR::Execute (.process.kill, id, 15);
- sleep (100);
- SCR::Execute (.process.kill, id);
+ give_kiwi_time_to_finish (id);
}
sleep (100);
} while (ret == nil);
- SCR::Execute (.process.kill, id);
+ give_kiwi_time_to_finish (id);
+
UI::CloseDialog ();
return ret == `ok;
}
@@ -590,6 +611,7 @@
*/
global map InitCurrentRepositories () {
+ current_repositories = $[];
Pkg::SourceRestore ();
foreach (map source, Pkg::SourceEditGet (), {
integer srcid = source["SrcId"]:-1;
Modified: trunk/product-creator/src/ProductCreator.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/ProductCreator.ycp?rev=58530&r1=58529&r2=58530&view=diff
==============================================================================
--- trunk/product-creator/src/ProductCreator.ycp (original)
+++ trunk/product-creator/src/ProductCreator.ycp Fri Sep 4 15:23:24 2009
@@ -698,6 +698,7 @@
list<integer> srcids = [];
+ // bnc#496263
if (Config["base_repo"]:"" == "")
srcids = [checkProductDependency()];
else
@@ -2255,10 +2256,17 @@
}
}
}
-
+ string arch = GetArch ();
list<string> initrds = splitstring(find_output, "\n");
// remove empty strings
- initrds = filter(string initrd, initrds, {return initrd != "";});
+ initrds = filter (string initrd, initrds, {
+ if (initrd == "")
+ return false;
+ // workaround for bnc#498464
+ if (arch == "s390x" && issubstring (initrd, "boot/i386/"))
+ return false;
+ return true;
+ });
y2milestone("Found initrds: %1", initrds);
boolean ret = true;
Modified: trunk/product-creator/src/kiwi_dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=58530&r1=58529&r2=58530&view=diff
==============================================================================
--- trunk/product-creator/src/kiwi_dialogs.ycp (original)
+++ trunk/product-creator/src/kiwi_dialogs.ycp Fri Sep 4 15:23:24 2009
@@ -18,6 +18,7 @@
import "Label";
import "Message";
import "Package";
+ import "PackageLock";
import "PackageSystem";
import "Popup";
import "ProductCreator";
@@ -660,7 +661,7 @@
// ok, now update the structures
user_map = $[
"pwd" : pwd,
- "encrypted" : false,
+ "encrypted" : user_map["encrypted"]:false && pwd == user_map["pwd"]:"",
"name" : username,
];
foreach (string key, ["home", "realname", "id"], {
@@ -1325,7 +1326,6 @@
];
string contentlabel = String::CutBlanks (content["LABEL"]:"");
string boot_image = label2boot[contentlabel]:"";
-// FIXME this actually is not used at all, only the one from template... :-(
// guess some default boot image value
if (kiwi_task == "iso" && !haskey (KiwiConfig, "isoboot") && boot_image != "")
@@ -1785,7 +1785,10 @@
"init" : InitPreferences,
"store" : StorePreferences,
"handle" : HandlePreferences,
- "no_help" : true,
+ // help text for locale (heading)
+ "help" : _("<p><b>Locale Settings</b></p>") +
+ // help text for locale
+ _("<p>The value of <b>Locale</b> (e.g. <tt>en_US</tt>) defines the contents of the RC_LANG variable in <t>/etc/sysconfig/language</tt>.</p>"),
],
"keytable" : $[
"widget" : `textentry,
@@ -1794,7 +1797,8 @@
"init" : InitPreferences,
"store" : StorePreferences,
"handle" : HandlePreferences,
- "no_help" : true,
+ // help text for keytable
+ "help" : _("<p><b>Keyboard layout</b> specifies the name of the console keymap to use. The value corresponds to a map file in <tt>/usr/share/kbd/keymaps</tt>.</p>"),
],
"timezone" : $[
"widget" : `textentry,
@@ -1803,7 +1807,8 @@
"init" : InitPreferences,
"store" : StorePreferences,
"handle" : HandlePreferences,
- "no_help" : true,
+ // help text for timezone
+ "help" : _("<p>It is also possible to set a specific <b>Time zone</b>. Available time zones are located in the <tt>/usr/share/zoneinfo</tt> directory.</p>"),
],
// ---------------- widgtes for users tab
"general_users" : $[
@@ -2356,6 +2361,8 @@
}
else if (ret == `next)
{
+ y2internal ("package lock check returned %1", PackageLock::Check ());
+
name = (string) UI::QueryWidget (`id (`config), `Value);
if (name == "")
{
@@ -2396,13 +2403,17 @@
ProductCreator::ResetArch();
- if (Arch::architecture () == "x86_64" &&
- UI::QueryWidget (`id (`i386), `Value) == true)
+ if (Arch::architecture () == "x86_64")
{
- Kiwi::image_architecture = "i386";
- ProductCreator::SetPackageArch ("i686");
- // closing sources, so they are created again with correct arch (bnc#510971)
- Pkg::SourceFinishAll ();
+ Kiwi::image_architecture = "x86_64";
+ if (UI::QueryWidget (`id (`i386), `Value) == true)
+ {
+ Kiwi::image_architecture = "i386";
+ // closing sources, so they are created again with correct arch (bnc#510971)
+ Pkg::SourceFinishAll ();
+ Pkg::SourceStartManager(false);
+ ProductCreator::SetPackageArch ("i686");
+ }
}
if (size (repositories) > 0)
Modified: trunk/product-creator/src/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/wizards.ycp?rev=58530&r1=58529&r2=58530&view=diff
==============================================================================
--- trunk/product-creator/src/wizards.ycp (original)
+++ trunk/product-creator/src/wizards.ycp Fri Sep 4 15:23:24 2009
@@ -150,6 +150,8 @@
// finish sources before next start, so 32bit and 64bit don't get mangled (bnc#510971)
Pkg::SourceFinishAll ();
+ Pkg::SourceStartManager(false);
+
Kiwi::initial_repositories = Kiwi::InitCurrentRepositories ();
Kiwi::Read ();
return `next;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
