Hello community,
here is the log from the commit of package yast2-online-update for
openSUSE:Factory
checked in at Fri Apr 8 14:59:20 CEST 2011.
--------
--- yast2-online-update/yast2-online-update.changes 2011-01-20
14:48:33.000000000 +0100
+++
/mounts/work_src_done/STABLE/yast2-online-update/yast2-online-update.changes
2011-04-08 12:57:26.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Apr 8 12:54:35 CEST 2011 - [email protected]
+
+- initialize package management after reboot (bnc#672966)
+- 2.21.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-online-update-2.20.2.tar.bz2
New:
----
yast2-online-update-2.21.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-online-update.spec ++++++
--- /var/tmp/diff_new_pack.2GEYkh/_old 2011-04-08 14:59:03.000000000 +0200
+++ /var/tmp/diff_new_pack.2GEYkh/_new 2011-04-08 14:59:03.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-online-update
-Version: 2.20.2
+Version: 2.21.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-online-update-2.20.2.tar.bz2
+Source0: yast2-online-update-2.21.0.tar.bz2
Prefix: /usr
@@ -57,7 +57,7 @@
YaST control center.
%prep
-%setup -n yast2-online-update-2.20.2
+%setup -n yast2-online-update-2.21.0
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-online-update-2.20.2.tar.bz2 -> yast2-online-update-2.21.0.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-online-update-2.20.2/VERSION
new/yast2-online-update-2.21.0/VERSION
--- old/yast2-online-update-2.20.2/VERSION 2011-01-20 14:43:06.000000000
+0100
+++ new/yast2-online-update-2.21.0/VERSION 2011-04-08 12:55:08.000000000
+0200
@@ -1 +1 @@
-2.20.2
+2.21.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-online-update-2.20.2/src/inst_you.ycp
new/yast2-online-update-2.21.0/src/inst_you.ycp
--- old/yast2-online-update-2.20.2/src/inst_you.ycp 2010-01-13
09:20:14.000000000 +0100
+++ new/yast2-online-update-2.21.0/src/inst_you.ycp 2011-04-08
09:43:40.000000000 +0200
@@ -34,11 +34,14 @@
}
boolean after_restart = false;
+ boolean after_reboot = false;
if (FileUtils::Exists (restarted_path))
{
- y2milestone ("installation restarted from YOU");
- SCR::Execute (.target.remove, restarted_path);
+ string action = (string) SCR::Read (.target.ycp, restarted_path);
+ y2milestone ("installation restarted from YOU (%1)", action);
after_restart = true;
+ after_reboot = (action == "reboot");
+ SCR::Execute (.target.remove, restarted_path);
}
if (!Internet::do_you && !after_restart) // nothing to do
@@ -156,6 +159,12 @@
// solver must be run after preselction (bnc#474601)
boolean solved = Pkg::PkgSolve (true);
+ if (selected < 1 && after_reboot)
+ {
+ y2milestone ("no patch available after reboot, skiping inst_you");
+ return `auto;
+ }
+
// run package selector to allow user interaction
if (!solved ||
ProductFeatures::GetBooleanFeature("globals", "manual_online_update") ||
@@ -302,10 +311,11 @@
if (more_patches_needed)
{
y2milestone ("there are more patches to install after reboot...");
- // after reboot, run the online update again
- ret = `reboot_same_step;
- SCR::Write (.target.ycp, restarted_path, 1);
}
+ // after reboot, run the online update again
+ // (even if no patches remain, to init Pkg before going on (see
bnc#672966)
+ ret = `reboot_same_step;
+ SCR::Write (.target.ycp, restarted_path, "reboot");
}
else if (ret == `restart_same_step)
{
@@ -313,7 +323,7 @@
if (more_patches_needed)
{
y2milestone ("restarting YaST, expecting another patches in the
next YOU run");
- SCR::Write (.target.ycp, restarted_path, 1);
+ SCR::Write (.target.ycp, restarted_path, "restart");
}
else
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
