Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory
checked in at Wed Oct 5 17:35:18 CEST 2011.
--------
--- openSUSE:Factory/autoyast2/autoyast2.changes 2011-10-04
18:06:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/autoyast2/autoyast2.changes 2011-10-05
13:24:30.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Oct 5 10:57:39 UTC 2011 - jsrain@site
+
+- prevent unwanted change of autoupgrade mode to autoinstallation
+ (bnc#722249)
+- 2.21.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
autoyast2-2.21.3.tar.bz2
New:
----
autoyast2-2.21.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.4iFtTz/_old 2011-10-05 17:35:14.000000000 +0200
+++ /var/tmp/diff_new_pack.4iFtTz/_new 2011-10-05 17:35:14.000000000 +0200
@@ -19,11 +19,11 @@
Name: autoyast2
-Version: 2.21.3
+Version: 2.21.4
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: autoyast2-2.21.3.tar.bz2
+Source0: autoyast2-2.21.4.tar.bz2
Prefix: /usr
@@ -65,7 +65,7 @@
installation sources.
%package installation
-Version: 2.21.3
+Version: 2.21.4
Summary: YaST2 - Auto Installation Modules
@@ -84,7 +84,7 @@
generated with the autoyast2 package.
%prep
-%setup -n autoyast2-2.21.3
+%setup -n autoyast2-2.21.4
%build
%{prefix}/bin/y2tool y2autoconf
++++++ autoyast2-2.21.3.tar.bz2 -> autoyast2-2.21.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.21.3/VERSION new/autoyast2-2.21.4/VERSION
--- old/autoyast2-2.21.3/VERSION 2011-10-04 17:12:53.000000000 +0200
+++ new/autoyast2-2.21.4/VERSION 2011-10-05 13:14:49.000000000 +0200
@@ -1 +1 @@
-2.21.3
+2.21.4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.21.3/configure
new/autoyast2-2.21.4/configure
--- old/autoyast2-2.21.3/configure 2011-10-04 17:14:00.000000000 +0200
+++ new/autoyast2-2.21.4/configure 2011-10-05 13:20:16.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for autoyast2 2.21.3.
+# Generated by GNU Autoconf 2.68 for autoyast2 2.21.4.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='autoyast2'
PACKAGE_TARNAME='autoyast2'
-PACKAGE_VERSION='2.21.3'
-PACKAGE_STRING='autoyast2 2.21.3'
+PACKAGE_VERSION='2.21.4'
+PACKAGE_STRING='autoyast2 2.21.4'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1237,7 +1237,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures autoyast2 2.21.3 to adapt to many kinds of systems.
+\`configure' configures autoyast2 2.21.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1308,7 +1308,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of autoyast2 2.21.3:";;
+ short | recursive ) echo "Configuration of autoyast2 2.21.4:";;
esac
cat <<\_ACEOF
@@ -1388,7 +1388,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-autoyast2 configure 2.21.3
+autoyast2 configure 2.21.4
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1405,7 +1405,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by autoyast2 $as_me 2.21.3, which was
+It was created by autoyast2 $as_me 2.21.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2335,7 +2335,7 @@
# Define the identity of the package.
PACKAGE='autoyast2'
- VERSION='2.21.3'
+ VERSION='2.21.4'
cat >>confdefs.h <<_ACEOF
@@ -2457,7 +2457,7 @@
-VERSION="2.21.3"
+VERSION="2.21.4"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <[email protected]>"
@@ -3498,7 +3498,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by autoyast2 $as_me 2.21.3, which was
+This file was extended by autoyast2 $as_me 2.21.4, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3551,7 +3551,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-autoyast2 config.status 2.21.3
+autoyast2 config.status 2.21.4
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.21.3/configure.in
new/autoyast2-2.21.4/configure.in
--- old/autoyast2-2.21.3/configure.in 2011-10-04 17:13:57.000000000 +0200
+++ new/autoyast2-2.21.4/configure.in 2011-10-05 13:20:13.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(autoyast2, 2.21.3, http://bugs.opensuse.org/, autoyast2)
+AC_INIT(autoyast2, 2.21.4, http://bugs.opensuse.org/, autoyast2)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.21.3"
+VERSION="2.21.4"
RPMNAME="autoyast2"
MAINTAINER="Uwe Gansert <[email protected]>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/autoyast2-2.21.3/src/modules/AutoInstall.ycp
new/autoyast2-2.21.4/src/modules/AutoInstall.ycp
--- old/autoyast2-2.21.3/src/modules/AutoInstall.ycp 2011-01-27
09:39:15.000000000 +0100
+++ new/autoyast2-2.21.4/src/modules/AutoInstall.ycp 2011-10-05
13:16:21.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Auto-installation related functions module
* Author: Anas Nashif <[email protected]>
*
- * $Id: AutoInstall.ycp 63230 2011-01-19 14:16:35Z jsrain $
+ * $Id: AutoInstall.ycp 66253 2011-10-05 11:11:21Z jsrain $
*/
{
module "AutoInstall";
@@ -134,12 +134,19 @@
{
boolean ret = Continue();
if (ret && size ( Profile::current ) > 0) {
- y2milestone("Enabling Auto-Installation mode");
- Mode::SetMode("autoinstallation");
+ if (Mode::autoupgrade()) {
+ y2milestone ("AutoYaST upgrade mode already set, keeping
it");
+ } else {
+ y2milestone("Enabling Auto-Installation mode");
+ Mode::SetMode("autoinstallation");
+ }
} else if (Mode::autoinst ()) {
y2milestone("No autoyast data found, switching back to manual
installation");
Mode::SetMode("installation");
- }
+ } else if (Mode::autoupgrade ()) {
+ y2milestone("No autoyast data found, switching back to manual
update");
+ Mode::SetMode("update");
+ }
}
else if (Stage::initial ())
{
continue with "q"...
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
