Hello community,
here is the log from the commit of package yast2 for openSUSE:Factory
checked in at Mon Jan 24 15:13:22 CET 2011.
--------
--- yast2/yast2.changes 2011-01-04 14:49:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2011-01-19 13:56:14.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Jan 19 13:49:18 CET 2011 - jsrain@suse.cz
+
+- adaptations for unattended migration (fate#310481)
+- 2.20.11
+
+-------------------------------------------------------------------
+Tue Jan 18 16:37:53 CET 2011 - aschnell@suse.de
+
+- call snapper from yast2 script
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-2.20.10.tar.bz2
New:
----
yast2-2.20.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.Js4aa7/_old 2011-01-24 15:11:39.000000000 +0100
+++ /var/tmp/diff_new_pack.Js4aa7/_new 2011-01-24 15:11:39.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2 (Version 2.20.10)
+# spec file for package yast2
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2
-Version: 2.20.10
+Version: 2.20.11
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-2.20.10.tar.bz2
+Source0: yast2-2.20.11.tar.bz2
Prefix: /usr
@@ -130,7 +130,7 @@
installation with YaST2.
%prep
-%setup -n yast2-2.20.10
+%setup -n yast2-2.20.11
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-2.20.10.tar.bz2 -> yast2-2.20.11.tar.bz2 ++++++
++++ 6723 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.20.10/VERSION new/yast2-2.20.11/VERSION
--- old/yast2-2.20.10/VERSION 2011-01-04 14:42:45.000000000 +0100
+++ new/yast2-2.20.11/VERSION 2011-01-19 13:54:23.000000000 +0100
@@ -1 +1 @@
-2.20.10
+2.20.11
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.20.10/configure.in new/yast2-2.20.11/configure.in
--- old/yast2-2.20.10/configure.in 2011-01-04 14:47:40.000000000 +0100
+++ new/yast2-2.20.11/configure.in 2011-01-19 13:54:59.000000000 +0100
@@ -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(yast2, 2.20.10, http://bugs.opensuse.org/, yast2)
+AC_INIT(yast2, 2.20.11, http://bugs.opensuse.org/, yast2)
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.20.10"
+VERSION="2.20.11"
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.20.10/data/sysconfig.yast2 new/yast2-2.20.11/data/sysconfig.yast2
--- old/yast2-2.20.10/data/sysconfig.yast2 2009-01-21 18:45:21.000000000 +0100
+++ new/yast2-2.20.11/data/sysconfig.yast2 2011-01-19 13:50:30.000000000 +0100
@@ -62,3 +62,8 @@
# summary - display an installation summary dialog, there user can decide whether to finish or restart
# The summary dialog is always displayed when an installation error has occured.
PKGMGR_ACTION_AT_EXIT="close"
+
+## Type: list(yes,no)
+## Default: "yes"
+# Enable use of snapper for YaST.
+USE_SNAPPER="yes"
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.20.10/library/modules/Mode.ycp new/yast2-2.20.11/library/modules/Mode.ycp
--- old/yast2-2.20.10/library/modules/Mode.ycp 2010-03-24 08:23:27.000000000 +0100
+++ new/yast2-2.20.11/library/modules/Mode.ycp 2011-01-19 13:50:52.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf
* Flags: Stable
*
- * $Id: Mode.ycp 61236 2010-03-10 15:39:50Z mvidner $
+ * $Id: Mode.ycp 63213 2011-01-19 12:50:51Z jsrain $
*
* Provide installation mode information.
* Mostly values from /etc/install.inf
@@ -88,6 +88,12 @@
{
_mode ="repair";
}
+ // FIXME according to what Linuxrc really writes
+ boolean autoupgrade = SCR::Read (.etc.install_inf.AutoUpgrade) != nil;
+ if (autoupgrade)
+ {
+ _mode = "autoupgrade";
+ }
}
}
@@ -113,7 +119,7 @@
if (! contains (
[ "installation", "update", "normal", "repair",
"autoinstallation", "autoinst_config",
- "live_installation"
+ "live_installation", "autoupgrade"
],
new_mode))
{
@@ -196,7 +202,7 @@
* we're doing an update
*/
global boolean update () {
- return mode () == "update";
+ return mode () == "update" || mode () == "autoupgrade";
}
global boolean Depeche () {
@@ -225,6 +231,13 @@
}
/**
+ * doing auto-upgrade
+ */
+global boolean autoupgrade () {
+ return mode () == "autoupgrade";
+}
+
+/**
* configuration for auto-installation, only in running system
*/
global boolean config () {
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.20.10/library/modules/Version.ycp new/yast2-2.20.11/library/modules/Version.ycp
--- old/yast2-2.20.10/library/modules/Version.ycp 2011-01-04 14:47:54.000000000 +0100
+++ new/yast2-2.20.11/library/modules/Version.ycp 2011-01-19 13:55:11.000000000 +0100
@@ -20,7 +20,7 @@
/**
* Version of the yast2 package
*/
-global string yast2 = "2.20.10";
+global string yast2 = "2.20.11";
/* EOF */
}
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.20.10/library/system/src/ModuleLoading.ycp new/yast2-2.20.11/library/system/src/ModuleLoading.ycp
--- old/yast2-2.20.10/library/system/src/ModuleLoading.ycp 2008-09-09 16:39:01.000000000 +0200
+++ new/yast2-2.20.11/library/system/src/ModuleLoading.ycp 2011-01-19 13:50:52.000000000 +0100
@@ -6,7 +6,7 @@
* Purpose:
* This module does all module loading stuff.
*
- * $Id: ModuleLoading.ycp 50724 2008-09-05 09:57:32Z locilka $
+ * $Id: ModuleLoading.ycp 63213 2011-01-19 12:50:51Z jsrain $
*/
{
module "ModuleLoading";
@@ -132,7 +132,7 @@
return `dont;
}
- if (ask_before_loading && !Mode::autoinst())
+ if (ask_before_loading && (!Mode::autoinst()) && (!Mode::autoupgrade()))
{
UI::OpenDialog(`opt(`decorated, `centered),
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.20.10/library/wizard/src/Confirm.ycp new/yast2-2.20.11/library/wizard/src/Confirm.ycp
--- old/yast2-2.20.10/library/wizard/src/Confirm.ycp 2010-03-24 08:23:27.000000000 +0100
+++ new/yast2-2.20.11/library/wizard/src/Confirm.ycp 2011-01-19 13:50:52.000000000 +0100
@@ -9,7 +9,7 @@
*
* Flags: Stable
*
- * $Id: Confirm.ycp 61424 2010-03-22 08:12:46Z mzugec $
+ * $Id: Confirm.ycp 63213 2011-01-19 12:50:51Z jsrain $
*/
{
@@ -40,7 +40,7 @@
if(Linuxrc::manual () != true) return true;
// L3: no interaction in AY, just re-probe (bnc#568653)
- if(Mode::autoinst () == true) return true;
+ if(Mode::autoinst () == true || Mode::autoupgrade() == true) return true;
if(Arch::s390()) return true;
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.20.10/scripts/yast2 new/yast2-2.20.11/scripts/yast2
--- old/yast2-2.20.10/scripts/yast2 2010-09-30 18:20:18.000000000 +0200
+++ new/yast2-2.20.11/scripts/yast2 2011-01-19 13:50:30.000000000 +0100
@@ -17,7 +17,7 @@
# allow for a different prefix
# strip the basename off $0, which can be: (bnc#382216, bnc#458385)
-# /sbin/yast2, /sbin/yast, yast2 (sh -x yast2 ...), /sbin//yast2 (PATH=/sbin/:...)
+# /sbin/yast2, /sbin/yast, yast2 (sh -x yast2 ...), /sbin/yast2 (PATH=/sbin/:...)
shopt -s extglob
mydir=${0%%*(/)[YyZz]a[Ss][Tt]?(2)}
if [[ -z "$mydir" || "$mydir" = /sbin ]]; then
@@ -208,6 +208,28 @@
fi
}
+
+SNAPPERBIN=/usr/bin/snapper
+
+snapshot_pre()
+{
+ if [ "$1" != "menu" ] ; then
+ if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then
+ SNAPSHOT_NUMBER=`$SNAPPERBIN --print-number create pre "yast2 $1"`
+ fi
+ fi
+}
+
+snapshot_post()
+{
+ if [ "$1" != "menu" ] ; then
+ if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then
+ $SNAPPERBIN create post $SNAPSHOT_NUMBER
+ fi
+ fi
+}
+
+
TEMP=`/usr/bin/getopt -o hlg:s:Si --long help,list,kcontrol,geometry:,style:,strings,install,update,remove,fullscreen,noborder,qt,gtk,ncurses \
-n 'yast2' -- "$@"`
@@ -388,6 +410,7 @@
# all other cases when YaST has to be restarted
*) REDO_FILE=/var/lib/YaST2/restart_yast ;;
esac
+ snapshot_pre $module
# break out on errors, #343258
while [ $exit_code = 0 ]; do
$ybindir/y2base $module "$@" "$SELECTED_GUI" $Y2_GEOMETRY $Y2UI_ARGS
@@ -396,6 +419,7 @@
break
fi
done
+ snapshot_post $module
fi
if [ "$UID" = 0 ]; then
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org