Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at Mon Jun 27 11:55:07 CEST 2011.
-------- --- yast2/yast2.changes 2011-02-08 16:47:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2011-06-23 17:41:25.000000000 +0200 @@ -1,0 +2,47 @@ +Thu Jun 23 15:28:19 UTC 2011 - [email protected] + +- read GPG keys in UTF-8 locale to properly read non-ASCII + characters, UTF-8 characters caused SLMS webyast module crashing + (bnc#696312) +- 2.21.3 + +------------------------------------------------------------------- +Thu Jun 23 09:48:12 UTC 2011 - [email protected] + +- Fixed abort callback to abort installation completely + (bnc#673629) +- 2.21.2 + +------------------------------------------------------------------- +Tue Jun 21 15:39:34 CEST 2011 - [email protected] + +- Fixed group desktop files by adding Exec=/sbin/yast2 (BNC#470482) + +------------------------------------------------------------------- +Thu Jun 16 17:40:28 CEST 2011 - [email protected] + +- Fixed crushed progress bar (bnc #675443) +- Version bump +- 2.21.1 + +------------------------------------------------------------------- +Thu Jun 16 14:55:22 CEST 2011 - [email protected] + +- Fixed regexp in Custom broadcast definition in + SuSEFirewallExpertRules (BNC #676972). +- 2.20.15 + +------------------------------------------------------------------- +Thu May 19 14:40:07 CEST 2011 - [email protected] + +- Don't assume YaST has crashed (and scare the user with a pop-up) + simply if a YCP script returns false (bnc#645434). +- 2.20.14 + +------------------------------------------------------------------- +Wed Mar 16 10:46:07 CET 2011 - [email protected] + +- Fixed dependencies (bnc #667938) +- 2.20.13 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-2.20.12.tar.bz2 New: ---- yast2-2.21.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.iHl9ED/_old 2011-06-27 11:53:15.000000000 +0200 +++ /var/tmp/diff_new_pack.iHl9ED/_new 2011-06-27 11:53:15.000000000 +0200 @@ -19,16 +19,16 @@ Name: yast2 -Version: 2.20.12 +Version: 2.21.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.20.12.tar.bz2 +Source0: yast2-2.21.3.tar.bz2 Prefix: /usr Group: System/YaST -License: GPLv2+ +License: GPL v2 or later Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite @@ -46,7 +46,7 @@ # changed StartPackage callback signature Requires: yast2-pkg-bindings >= 2.20.3 -Requires: yast2_ui yast2-branding +Requires: yast2_ui # For Cron Agent, Module Requires: perl-Config-Crontab # for ag_tty (/bin/stty) @@ -114,7 +114,7 @@ installation with YaST2 %package devel-doc -License: GPLv2+ + Requires: yast2 = %version Group: System/YaST Provides: yast2-lib-sequencer-devel @@ -130,7 +130,7 @@ installation with YaST2. %prep -%setup -n yast2-2.20.12 +%setup -n yast2-2.21.3 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-2.20.12.tar.bz2 -> yast2-2.21.3.tar.bz2 ++++++ ++++ 7112 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.12/configure.in new/yast2-2.21.3/configure.in --- old/yast2-2.20.12/configure.in 2011-02-08 16:45:49.000000000 +0100 +++ new/yast2-2.21.3/configure.in 2011-06-23 17:40:21.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(yast2, 2.20.12, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.21.3, 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.12" +VERSION="2.21.3" RPMNAME="yast2" MAINTAINER="Jiri Srain <[email protected]>" 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.12/data/sysconfig.yast2 new/yast2-2.21.3/data/sysconfig.yast2 --- old/yast2-2.20.12/data/sysconfig.yast2 2011-01-19 13:50:30.000000000 +0100 +++ new/yast2-2.21.3/data/sysconfig.yast2 2011-06-16 10:18:19.000000000 +0200 @@ -64,6 +64,6 @@ PKGMGR_ACTION_AT_EXIT="close" ## Type: list(yes,no) -## Default: "yes" +## Default: "no" # Enable use of snapper for YaST. -USE_SNAPPER="yes" +USE_SNAPPER="no" 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.12/library/desktop/groups/hardware.desktop new/yast2-2.21.3/library/desktop/groups/hardware.desktop --- old/yast2-2.20.12/library/desktop/groups/hardware.desktop 2010-08-18 13:48:26.000000000 +0200 +++ new/yast2-2.21.3/library/desktop/groups/hardware.desktop 2011-06-23 11:19:43.000000000 +0200 @@ -16,4 +16,4 @@ Name=Hardware X-KDE-SubstituteUID=true -Exec=yast2 +Exec=/sbin/yast2 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.12/library/desktop/groups/high_availability.desktop new/yast2-2.21.3/library/desktop/groups/high_availability.desktop --- old/yast2-2.20.12/library/desktop/groups/high_availability.desktop 2010-08-18 13:48:26.000000000 +0200 +++ new/yast2-2.21.3/library/desktop/groups/high_availability.desktop 2011-06-23 11:19:43.000000000 +0200 @@ -15,4 +15,4 @@ Name=High Availability -Exec=yast2 +Exec=/sbin/yast2 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.12/library/desktop/groups/misc.desktop new/yast2-2.21.3/library/desktop/groups/misc.desktop --- old/yast2-2.20.12/library/desktop/groups/misc.desktop 2010-08-18 13:48:26.000000000 +0200 +++ new/yast2-2.21.3/library/desktop/groups/misc.desktop 2011-06-23 11:19:43.000000000 +0200 @@ -16,5 +16,4 @@ Name=Miscellaneous X-KDE-SubstituteUID=true -Exec=yast2 - +Exec=/sbin/yast2 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.12/library/desktop/groups/network_devices.desktop new/yast2-2.21.3/library/desktop/groups/network_devices.desktop --- old/yast2-2.20.12/library/desktop/groups/network_devices.desktop 2010-08-18 13:48:26.000000000 +0200 +++ new/yast2-2.21.3/library/desktop/groups/network_devices.desktop 2011-06-23 11:19:43.000000000 +0200 @@ -16,5 +16,4 @@ Name=Network Devices X-KDE-SubstituteUID=true -Exec=yast2 - +Exec=/sbin/yast2 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.12/library/desktop/groups/network_services.desktop new/yast2-2.21.3/library/desktop/groups/network_services.desktop --- old/yast2-2.20.12/library/desktop/groups/network_services.desktop 2010-08-18 13:48:26.000000000 +0200 +++ new/yast2-2.21.3/library/desktop/groups/network_services.desktop 2011-06-23 11:19:43.000000000 +0200 @@ -16,4 +16,4 @@ Name=Network Services X-KDE-SubstituteUID=true -Exec=yast2 +Exec=/sbin/yast2 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.12/library/desktop/groups/security.desktop new/yast2-2.21.3/library/desktop/groups/security.desktop --- old/yast2-2.20.12/library/desktop/groups/security.desktop 2010-08-18 13:48:26.000000000 +0200 +++ new/yast2-2.21.3/library/desktop/groups/security.desktop 2011-06-23 11:19:43.000000000 +0200 @@ -17,5 +17,4 @@ X-KDE-SubstituteUID=true -Exec=yast2 - +Exec=/sbin/yast2 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.12/library/desktop/groups/software.desktop new/yast2-2.21.3/library/desktop/groups/software.desktop --- old/yast2-2.20.12/library/desktop/groups/software.desktop 2010-08-18 13:48:26.000000000 +0200 +++ new/yast2-2.21.3/library/desktop/groups/software.desktop 2011-06-23 11:19:43.000000000 +0200 @@ -16,5 +16,4 @@ Name=Software X-KDE-SubstituteUID=true -Exec=yast2 - +Exec=/sbin/yast2 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.12/library/desktop/groups/support.desktop new/yast2-2.21.3/library/desktop/groups/support.desktop --- old/yast2-2.20.12/library/desktop/groups/support.desktop 2010-08-18 13:48:26.000000000 +0200 +++ new/yast2-2.21.3/library/desktop/groups/support.desktop 2011-06-23 11:19:43.000000000 +0200 @@ -16,4 +16,4 @@ Name=Support X-KDE-SubstituteUID=true -Exec=yast2 +Exec=/sbin/yast2 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.12/library/desktop/groups/system.desktop new/yast2-2.21.3/library/desktop/groups/system.desktop --- old/yast2-2.20.12/library/desktop/groups/system.desktop 2010-08-18 13:48:26.000000000 +0200 +++ new/yast2-2.21.3/library/desktop/groups/system.desktop 2011-06-23 11:19:43.000000000 +0200 @@ -16,4 +16,4 @@ Name=System X-KDE-SubstituteUID=true -Exec=yast2 +Exec=/sbin/yast2 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.12/library/gpg/src/GPG.ycp new/yast2-2.21.3/library/gpg/src/GPG.ycp --- old/yast2-2.20.12/library/gpg/src/GPG.ycp 2010-08-18 13:48:26.000000000 +0200 +++ new/yast2-2.21.3/library/gpg/src/GPG.ycp 2011-06-23 17:40:13.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: A wrapper for gpg binary * Authors: Ladislav Slezák <[email protected]> * - * $Id: GPG.ycp 60336 2010-01-12 14:18:15Z lslezak $ + * $Id: GPG.ycp 64567 2011-06-23 15:40:16Z lslezak $ * * This module provides GPG key related functions. It is a wrapper around gpg * binary. It uses caching for reading GPG keys from the keyrings. @@ -76,7 +76,7 @@ map callGPG(string options) { map ret = $[]; - string command = "LC_ALL=C " + buildGPGcommand(options); + string command = "LC_ALL=en_US.UTF-8 " + buildGPGcommand(options); ret = (map) SCR::Execute(.target.bash_output, command); 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.12/library/modules/Arch.ycp new/yast2-2.21.3/library/modules/Arch.ycp --- old/yast2-2.20.12/library/modules/Arch.ycp 2010-08-18 13:48:26.000000000 +0200 +++ new/yast2-2.21.3/library/modules/Arch.ycp 2011-06-09 10:56:28.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Klaus Kaempf <[email protected]> * Flags: Stable * - * $Id: Arch.ycp 53241 2008-11-12 17:37:21Z jdsn $ + * $Id: Arch.ycp 64243 2011-06-07 08:55:37Z lidongyang $ */ { @@ -34,6 +34,9 @@ // Xen dom0 boolean _is_xen0 = nil; +// KVM +boolean _is_kvm = nil; + /* ************************************************************ */ /* system architecture */ @@ -447,6 +450,26 @@ } /* ************************************************************ */ +/* KVM stuff */ + +/** + * true if KVM is running + * + * @return true if we are running on KVM hypervisor + */ +global boolean is_kvm () { + if (_is_kvm == nil) { + // KVM hypervisor has /dev/kvm file + map stat = (map)SCR::Read(.target.stat, "/dev/kvm"); + y2milestone("stat /dev/kvm: %1", stat); + + _is_kvm = (size(stat) > 0); + } + + return _is_kvm; +} + +/* ************************************************************ */ /* SMP stuff */ /** 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.12/library/modules/Version.ycp new/yast2-2.21.3/library/modules/Version.ycp --- old/yast2-2.20.12/library/modules/Version.ycp 2011-02-08 16:46:06.000000000 +0100 +++ new/yast2-2.21.3/library/modules/Version.ycp 2011-06-23 17:40:27.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.20.12"; +global string yast2 = "2.21.3"; /* 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.12/library/network/src/SuSEFirewallExpertRules.ycp new/yast2-2.21.3/library/network/src/SuSEFirewallExpertRules.ycp --- old/yast2-2.20.12/library/network/src/SuSEFirewallExpertRules.ycp 2010-08-18 13:48:23.000000000 +0200 +++ new/yast2-2.21.3/library/network/src/SuSEFirewallExpertRules.ycp 2011-06-23 11:19:43.000000000 +0200 @@ -83,7 +83,7 @@ // A.B.C.D/1 - A.B.C.D/32 (IP with a numeric netmask) else if (regexpmatch(network, "^" + type_ip4 + "/[01234567890]+$")) { string part_ip = regexpsub (network, "^(" + type_ip4 + ")/[01234567890]+$", "\\1"); - string part_bits = regexpsub (network, "^" + type_ip4 + "(/[01234567890])+$", "\\1"); + string part_bits = regexpsub (network, "^" + type_ip4 + "/([01234567890]+)$", "\\1"); return (IP::Check4(part_ip) && ValidNetmaskBits(tointeger(part_bits))); } 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.12/library/network/testsuite/tests/SuSEFirewallExpertRules.out new/yast2-2.21.3/library/network/testsuite/tests/SuSEFirewallExpertRules.out --- old/yast2-2.20.12/library/network/testsuite/tests/SuSEFirewallExpertRules.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.21.3/library/network/testsuite/tests/SuSEFirewallExpertRules.out 2011-06-23 11:19:43.000000000 +0200 @@ -0,0 +1,16 @@ +Dump == IsValidNetwork == +Dump All these should be *valid* (true): +Return true +Return true +Return true +Return true +Return true +Return true +Return true +Dump All these should be *invalid* (false): +Return false +Return false +Return false +Return false +Return false +Dump == Done == 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.12/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp new/yast2-2.21.3/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp --- old/yast2-2.20.12/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.21.3/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp 2011-06-23 11:19:43.000000000 +0200 @@ -0,0 +1,31 @@ +{ + + include "testsuite.ycp"; + // testedfiles: SuSEFirewallExpertRules + + import "SuSEFirewallExpertRules"; + + DUMP("== IsValidNetwork =="); + + list <string> valid_network_definitions = [ + "192.168.0.1", "192.168.0.0/24", "192.168.0.1/32", "192.168.0.0/255.255.0.0", + "192.168.0.0/255.255.224.0", "0/0", "192.168.0.1/16", + ]; + + list <string> invalid_network_definitions = [ + "192.168.0.355", "192.168.0.1/0", "192.168.0.0/255.255.333.0", + "192.168.0.1/888", "192.168.0.1/33", + ]; + + DUMP("All these should be *valid* (true):"); + foreach (string check_this, valid_network_definitions, { + TEST(``(SuSEFirewallExpertRules::IsValidNetwork (check_this)), [], nil); + }); + + DUMP("All these should be *invalid* (false):"); + foreach (string check_this, invalid_network_definitions, { + TEST(``(SuSEFirewallExpertRules::IsValidNetwork (check_this)), [], nil); + }); + + DUMP("== Done =="); +} 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.12/library/packages/src/PackageCallbacks.ycp new/yast2-2.21.3/library/packages/src/PackageCallbacks.ycp --- old/yast2-2.20.12/library/packages/src/PackageCallbacks.ycp 2011-01-11 09:10:20.000000000 +0100 +++ new/yast2-2.21.3/library/packages/src/PackageCallbacks.ycp 2011-06-23 17:06:46.000000000 +0200 @@ -7,7 +7,7 @@ * * Purpose: provides the default Callbacks for Pkg:: * - * $Id: PackageCallbacks.ycp 63064 2011-01-03 16:53:29Z lslezak $ + * $Id: PackageCallbacks.ycp 64558 2011-06-23 09:50:05Z lslezak $ * */ @@ -159,7 +159,7 @@ `Left (`Label (sz)) ) )), - `ProgressBar(`id(`progress), "", 100, 0 ), + `ProgressBar(`id(`progress), " ", 100, 0 ), `ButtonBox ( `PushButton (`id (`abort), `opt (`key_F9, `cancelButton), Label::AbortButton ()) ) @@ -1063,6 +1063,10 @@ autorefreshing_aborted = true; Pkg::SkipRefresh(); } + else + { + provide_aborted = true; + } return "C"; } 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.12/scripts/yast2 new/yast2-2.21.3/scripts/yast2 --- old/yast2-2.20.12/scripts/yast2 2011-01-19 13:50:30.000000000 +0100 +++ new/yast2-2.21.3/scripts/yast2 2011-06-09 10:56:28.000000000 +0200 @@ -71,7 +71,7 @@ { # handily, exit_code is set to $? of y2base. # If there was an error and there is anything to display, pop up. - if [ $exit_code != 0 -a -s $ERRLOG ]; then + if [ $exit_code != 0 -a $exit_code != 16 -a -s $ERRLOG ]; then display_error_file $ERRLOG fi rm -f $ERRLOG @@ -215,7 +215,7 @@ { if [ "$1" != "menu" ] ; then if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then - SNAPSHOT_NUMBER=`$SNAPPERBIN --print-number create pre "yast2 $1"` + SNAPSHOT_NUMBER=`$SNAPPERBIN create --type=pre --cleanup=number --print-number --description="yast $1"` fi fi } @@ -224,7 +224,7 @@ { if [ "$1" != "menu" ] ; then if [ "$USE_SNAPPER" = "yes" -a -x $SNAPPERBIN ] ; then - $SNAPPERBIN create post $SNAPSHOT_NUMBER + $SNAPPERBIN create --type=post --cleanup=number --pre-number=$SNAPSHOT_NUMBER fi fi } 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.12/VERSION new/yast2-2.21.3/VERSION --- old/yast2-2.20.12/VERSION 2011-02-08 16:38:23.000000000 +0100 +++ new/yast2-2.21.3/VERSION 2011-06-23 17:39:34.000000000 +0200 @@ -1 +1 @@ -2.20.12 +2.21.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
