Hello community,
here is the log from the commit of package yast2-installation
checked in at Fri Apr 21 13:13:45 CEST 2006.
--------
--- yast2-installation/yast2-installation.changes 2006-04-20 19:17:24.000000000 +0200
+++ NOARCH/yast2-installation/yast2-installation.changes 2006-04-20 22:28:25.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 20 22:22:59 CEST 2006 - jsrain@suse.de
+
+- handle installation restart with repeating last step (#167561)
+- 2.13.82
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-2.13.81.tar.bz2
New:
----
yast2-installation-2.13.82.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.ptXLPc/_old 2006-04-21 13:11:59.000000000 +0200
+++ /var/tmp/diff_new_pack.ptXLPc/_new 2006-04-21 13:11:59.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-installation (Version 2.13.81)
+# spec file for package yast2-installation (Version 2.13.82)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-installation
-Version: 2.13.81
+Version: 2.13.82
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-installation-2.13.81.tar.bz2
+Source0: yast2-installation-2.13.82.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-testsuite
Requires: yast2 yast2-update
@@ -48,7 +48,7 @@
Arvin Schnell
%prep
-%setup -n yast2-installation-2.13.81
+%setup -n yast2-installation-2.13.82
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,6 +106,9 @@
/usr/X11R6/share/fvwm/
%changelog -n yast2-installation
+* Thu Apr 20 2006 - jsrain@suse.de
+- handle installation restart with repeating last step (#167561)
+- 2.13.82
* Thu Apr 20 2006 - jdsn@suse.de
- proxy support for registration process (#165891)
- disable w3m registration by control variable (aj)
++++++ yast2-installation-2.13.81.tar.bz2 -> yast2-installation-2.13.82.tar.bz2 ++++++
++++ 14652 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.81/VERSION new/yast2-installation-2.13.82/VERSION
--- old/yast2-installation-2.13.81/VERSION 2006-04-20 16:27:26.000000000 +0200
+++ new/yast2-installation-2.13.82/VERSION 2006-04-20 22:27:23.000000000 +0200
@@ -1 +1 @@
-2.13.81
+2.13.82
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.81/configure.in new/yast2-installation-2.13.82/configure.in
--- old/yast2-installation-2.13.81/configure.in 2006-04-20 18:52:26.000000000 +0200
+++ new/yast2-installation-2.13.82/configure.in 2006-04-20 22:29:20.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-installation, 2.13.81, http://www.suse.de/feedback, yast2-installation)
+AC_INIT(yast2-installation, 2.13.82, http://www.suse.de/feedback, yast2-installation)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.13.81"
+VERSION="2.13.82"
RPMNAME="yast2-installation"
MAINTAINER="Jiri Srain "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.81/control/docs/control-doc.xml new/yast2-installation-2.13.82/control/docs/control-doc.xml
--- old/yast2-installation-2.13.81/control/docs/control-doc.xml 2006-03-15 16:33:54.000000000 +0100
+++ new/yast2-installation-2.13.82/control/docs/control-doc.xml 2006-02-02 19:55:05.000000000 +0100
@@ -28,7 +28,7 @@
0.1
</revnumber>
<date>
- $Date: 2004-10-27 16:25:24 +0200 (Wed, 27 Oct 2004) $
+ $Date: 2004-10-27 08:25:24 -0600 (Wed, 27 Oct 2004) $
</date>
<revremark>Initial Release as PDF</revremark>
</revision>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.81/src/clients/inst_system_analysis.ycp new/yast2-installation-2.13.82/src/clients/inst_system_analysis.ycp
--- old/yast2-installation-2.13.81/src/clients/inst_system_analysis.ycp 2006-04-18 17:55:57.000000000 +0200
+++ new/yast2-installation-2.13.82/src/clients/inst_system_analysis.ycp 2006-04-20 22:27:03.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Installation mode selection, system analysis
* Authors: Jiri Srain
*
- * $Id: inst_system_analysis.ycp 30206 2006-04-18 19:44:14Z jsrain $
+ * $Id: inst_system_analysis.ycp 30311 2006-04-20 20:25:02Z jsrain $
*
*/
@@ -341,14 +341,7 @@
}
Packages::InitializeCatalogs ();
-if (Packages::add_on_products_list != nil)
-{
- y2milestone ("Found list of add-on products to preselect");
- Packages::SelectProduct ();
- PackageCallbacksInit::SetMediaCallbacks();
- AddOnProduct::AddPreselectedAddOnProducts (Packages::add_on_products_list);
- Packages::add_on_products_list = nil; // do not select them any more
-}
+Packages::InitializeAddOnProducts ();
if (Mode::mode () != start_mode)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.13.81/src/clients/installation.ycp new/yast2-installation-2.13.82/src/clients/installation.ycp
--- old/yast2-installation-2.13.81/src/clients/installation.ycp 2006-04-20 16:16:24.000000000 +0200
+++ new/yast2-installation-2.13.82/src/clients/installation.ycp 2006-04-20 22:27:03.000000000 +0200
@@ -12,7 +12,7 @@
* Describing and calling all submodules, depending on
* the installation should be started or continued.
*
- * $Id: installation.ycp 30290 2006-04-20 14:09:31Z mvidner $
+ * $Id: installation.ycp 30311 2006-04-20 20:25:02Z jsrain $
*/
{
textdomain "installation";
@@ -354,9 +354,14 @@
ret = ProductControl::Run();
}
- if (Stage::cont () && (ret == `reboot || ret == `restart_yast))
+ if (Stage::cont () && (ret == `reboot || ret == `restart_yast || ret == `restart_same_step))
{
integer last_step = ProductControl::CurrentStep ();
+ if (ret == `restart_same_step)
+ {
+ last_step = last_step - 1;
+ ret = `restart_yast;
+ }
integer next_step = last_step + 1;
SCR::Write (.target.string, restart_data_file,
sformat ("%1", next_step));
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...