Hello community,
here is the log from the commit of package yast2-installation
checked in at Wed Apr 30 11:53:05 CEST 2008.
--------
--- yast2-installation/yast2-installation.changes 2008-04-28 17:50:51.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-installation/yast2-installation.changes 2008-04-30 10:26:24.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Apr 30 10:24:19 CEST 2008 - locilka(a)suse.cz
+
+- Making automatic installation more robust (bnc #384972).
+- 2.16.42
+
+-------------------------------------------------------------------
+Tue Apr 29 12:59:49 CEST 2008 - locilka(a)suse.cz
+
+- Disabling Progress when calling inst_finish scripts.
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.16.41.tar.bz2
New:
----
yast2-installation-2.16.42.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.rd9222/_old 2008-04-30 11:52:57.000000000 +0200
+++ /var/tmp/diff_new_pack.rd9222/_new 2008-04-30 11:52:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.16.41)
+# spec file for package yast2-installation (Version 2.16.42)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-installation
-Version: 2.16.41
+Version: 2.16.42
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.16.41.tar.bz2
+Source0: yast2-installation-2.16.42.tar.bz2
Prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite
# PackageCallbacks::RegisterEmptyProgressCallbacks()
@@ -107,7 +107,7 @@
Lukas Ocilka <locilka(a)suse.cz>
%prep
-%setup -n yast2-installation-2.16.41
+%setup -n yast2-installation-2.16.42
%build
%{prefix}/bin/y2tool y2autoconf
@@ -173,6 +173,11 @@
%exclude %{prefix}/share/doc/packages/yast2-installation/COPYING
%exclude %{prefix}/share/doc/packages/yast2-installation/README
%changelog
+* Wed Apr 30 2008 locilka(a)suse.cz
+- Making automatic installation more robust (bnc #384972).
+- 2.16.42
+* Tue Apr 29 2008 locilka(a)suse.cz
+- Disabling Progress when calling inst_finish scripts.
* Mon Apr 28 2008 locilka(a)suse.cz
- Handling KDE3 vs KDE4 in default logon and window managers
(bnc #381821).
++++++ yast2-installation-2.16.41.tar.bz2 -> yast2-installation-2.16.42.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.41/src/clients/inst_automatic_configuration.ycp new/yast2-installation-2.16.42/src/clients/inst_automatic_configuration.ycp
--- old/yast2-installation-2.16.41/src/clients/inst_automatic_configuration.ycp 2008-04-22 18:52:44.000000000 +0200
+++ new/yast2-installation-2.16.42/src/clients/inst_automatic_configuration.ycp 2008-04-30 10:29:50.000000000 +0200
@@ -140,8 +140,15 @@
current_sub_step = current_sub_step + 1;
current_step = current_step + 1;
- UI::ChangeWidget (`id ("one_set_progress"), `Value, current_sub_step);
- UI::ChangeWidget (`id ("autoconf_progress"), `Value, current_step);
+ if (UI::WidgetExists (`id ("one_set_progress")))
+ UI::ChangeWidget (`id ("one_set_progress"), `Value, current_sub_step);
+ else
+ y2error ("Widget one_set_progress doesn't exist");
+
+ if (UI::WidgetExists (`id ("autoconf_progress")))
+ UI::ChangeWidget (`id ("autoconf_progress"), `Value, current_step);
+ else
+ y2error ("Widget autoconf_progress doesn't exist");
}
void DummyFunction () {
@@ -251,18 +258,28 @@
foreach (map one_autoconf_call, proposal_scripts_to_call, {
string type = one_autoconf_call["type"]:"";
+ integer nr_of_steps = ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[]));
+ string label = one_autoconf_call["label"]:_("Automatic configuration...");
+
+ y2milestone ("Steps: %1, Label: %2", nr_of_steps, label);
+
// reset the faster prgress
current_sub_step = 0;
- UI::ReplaceWidget (`id ("rp_one_set_progress"),
- `ProgressBar (
- `id ("one_set_progress"),
- one_autoconf_call["label"]:_("Automatic configuration..."),
- ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[])),
- 0
- )
- );
- y2milestone ("Steps: %1", ((one_autoconf_call["type"]:"" == "proposals" ? 2:1) * size (one_autoconf_call["items"]:[])));
- y2milestone ("Label: %1", one_autoconf_call["label"]:_("Automatic configuration..."));
+ if (UI::WidgetExists (`id ("rp_one_set_progress"))) {
+ UI::ReplaceWidget (`id ("rp_one_set_progress"),
+ `ProgressBar (
+ `id ("one_set_progress"),
+ label,
+ nr_of_steps,
+ 0
+ )
+ );
+ } else {
+ y2error ("Widget rp_one_set_progress doesn't exist! Cannot provide useful progress...");
+ y2warning ("---------------------- UI DUMP ----------------------");
+ UI::DumpWidgetTree();
+ y2warning ("---------------------- UI DUMP ----------------------");
+ }
switch (type) {
case "scripts":
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.41/src/clients/inst_extrasources.ycp new/yast2-installation-2.16.42/src/clients/inst_extrasources.ycp
--- old/yast2-installation-2.16.41/src/clients/inst_extrasources.ycp 2008-04-28 15:49:52.000000000 +0200
+++ new/yast2-installation-2.16.42/src/clients/inst_extrasources.ycp 2008-04-29 18:32:42.000000000 +0200
@@ -23,6 +23,7 @@
import "ProductFeatures";
// We need the constructor
import "ProductControl";
+import "Installation";
/**
* Returns list of maps of repositories to register. See bnc #381360.
@@ -137,7 +138,7 @@
Pkg::SourceStartManager (false);
// to initialize target because of installed products
- return (Pkg::TargetInit ("/", false) == true);
+ return (Pkg::TargetInit (Installation::destdir, false) == true);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.41/src/clients/inst_finish.ycp new/yast2-installation-2.16.42/src/clients/inst_finish.ycp
--- old/yast2-installation-2.16.41/src/clients/inst_finish.ycp 2008-04-17 11:08:36.000000000 +0200
+++ new/yast2-installation-2.16.42/src/clients/inst_finish.ycp 2008-04-29 13:00:56.000000000 +0200
@@ -6,7 +6,7 @@
* Arvin Schnell <arvin(a)suse.de>
* Jiri Srain <jsrain(a)suse.de>
*
- * $Id: inst_finish.ycp 46602 2008-04-14 14:57:13Z locilka $
+ * $Id: inst_finish.ycp 47153 2008-04-29 11:00:56Z locilka $
*
* Writes:
* [target] /var/lib/YaST2/runme_at_boot run yast2 after initial boot
@@ -190,7 +190,9 @@
y2milestone ("Calling inst_finish script: %1 (Info)", s);
// TODO: check if client exists
// client doesn't need to exist on purpose
+ boolean orig = Progress::set (false);
map info = (map)WFM::CallFunction (s, ["Info"]);
+ Progress::set (orig);
if (info == nil) {
y2error ("Client %1 returned invalid data", s);
@@ -257,7 +259,11 @@
}
if (haskey (step, "title"))
Progress::Title (step["title"]:"");
+
+ boolean orig = Progress::set (false);
WFM::CallFunction (step["client"]:"", ["Write"]);
+ Progress::set (orig);
+
if (UI::PollInput () == `abort && Popup::ConfirmAbort (`incomplete))
{
aborted = true;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.16.41/VERSION new/yast2-installation-2.16.42/VERSION
--- old/yast2-installation-2.16.41/VERSION 2008-04-28 15:58:35.000000000 +0200
+++ new/yast2-installation-2.16.42/VERSION 2008-04-30 10:24:08.000000000 +0200
@@ -1 +1 @@
-2.16.41
+2.16.42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org