Hello community,
here is the log from the commit of package yast2
checked in at Thu Oct 19 14:19:06 CEST 2006.
--------
--- yast2/yast2.changes 2006-10-18 14:08:11.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2006-10-18 15:15:54.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Oct 18 15:12:08 CEST 2006 - locilka@suse.cz
+
+- Returning `abort from ProductControl::Run in case of Abort button
+ pressed during the second stage installation (FATE #300422).
+- 2.14.6
+
+-------------------------------------------------------------------
Old:
----
yast2-2.14.5.tar.bz2
New:
----
yast2-2.14.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.8cpIgk/_old 2006-10-19 14:17:51.000000000 +0200
+++ /var/tmp/diff_new_pack.8cpIgk/_new 2006-10-19 14:17:51.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.14.5)
+# spec file for package yast2 (Version 2.14.6)
#
# 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
-Version: 2.14.5
+Version: 2.14.6
Release: 1
License: GNU General Public License (GPL) - all versions
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.14.5.tar.bz2
+Source0: yast2-2.14.6.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pkg-bindings yast2-testsuite
# Need the new file popups
@@ -97,7 +97,7 @@
Steffen Winterfeldt
%prep
-%setup -n yast2-2.14.5
+%setup -n yast2-2.14.6
%build
%{prefix}/bin/y2tool y2autoconf
@@ -197,6 +197,10 @@
%doc %{prefix}/share/doc/packages/yast2/wizard
%changelog -n yast2
+* Wed Oct 18 2006 - locilka@suse.cz
+- Returning `abort from ProductControl::Run in case of Abort button
+ pressed during the second stage installation (FATE #300422).
+- 2.14.6
* Wed Oct 18 2006 - kmachalkova@suse.cz
- NetworkDevices: return device type (e.g. netcard, modem,..) in
human readable form
++++++ yast2-2.14.5.tar.bz2 -> yast2-2.14.6.tar.bz2 ++++++
++++ 9059 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-2.14.5/VERSION new/yast2-2.14.6/VERSION
--- old/yast2-2.14.5/VERSION 2006-10-18 13:47:25.000000000 +0200
+++ new/yast2-2.14.6/VERSION 2006-10-18 15:18:45.000000000 +0200
@@ -1 +1 @@
-2.14.5
+2.14.6
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-2.14.5/configure.in new/yast2-2.14.6/configure.in
--- old/yast2-2.14.5/configure.in 2006-10-18 14:04:10.000000000 +0200
+++ new/yast2-2.14.6/configure.in 2006-10-18 15:24:23.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2
dnl
-dnl -- This file is generated by y2autoconf 2.13.26 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2, 2.14.5, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.14.6, http://bugs.opensuse.org/, yast2)
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.14.5"
+VERSION="2.14.6"
RPMNAME="yast2"
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-2.14.5/library/control/src/ProductControl.ycp new/yast2-2.14.6/library/control/src/ProductControl.ycp
--- old/yast2-2.14.5/library/control/src/ProductControl.ycp 2006-10-18 13:26:32.000000000 +0200
+++ new/yast2-2.14.6/library/control/src/ProductControl.ycp 2006-10-18 15:19:42.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Product Control routines
* Authors: Anas Nashif
*
- * $Id: ProductControl.ycp 33164 2006-09-27 08:42:24Z jsrain $
+ * $Id: ProductControl.ycp 33499 2006-10-18 13:19:41Z locilka $
*/
{
textdomain "base";
@@ -1011,6 +1011,11 @@
}
else if (result == `abort)
{
+ // FATE #300422
+ // handling when user aborts the second stage installation
+ if (Stage::cont ()) {
+ final_result = result;
+ }
break;
}
else if (result == `finish)
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-2.14.5/library/modules/Version.ycp new/yast2-2.14.6/library/modules/Version.ycp
--- old/yast2-2.14.5/library/modules/Version.ycp 2006-10-18 14:04:26.000000000 +0200
+++ new/yast2-2.14.6/library/modules/Version.ycp 2006-10-18 15:24:40.000000000 +0200
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.14.5";
+global string yast2 = "2.14.6";
/* EOF */
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org