Hello community,
here is the log from the commit of package yast2-backup for openSUSE:Factory
checked in at Wed Dec 16 12:54:32 CET 2009.
--------
--- yast2-backup/yast2-backup.changes 2009-06-17 15:07:26.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-backup/yast2-backup.changes 2009-12-03 15:43:39.000000000 +0100
@@ -1,0 +2,14 @@
+Wed Dec 2 15:41:11 CET 2009 - locilka@suse.cz
+
+- Fixed infinite loop in case of old archives to keep set to zero
+ (bnc #550996).
+- Fixed Mode when running in cron, 'commandline' is used instead of
+ 'testsuite' (bnc #548427).
+- 2.19.0
+
+-------------------------------------------------------------------
+Wed Jun 24 13:35:51 CEST 2009 - locilka@suse.cz
+
+- Fixed 'bytes' units in help text (bnc #513438).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-backup-2.18.4.tar.bz2
New:
----
yast2-backup-2.19.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-backup.spec ++++++
--- /var/tmp/diff_new_pack.HxHLz5/_old 2009-12-16 12:54:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HxHLz5/_new 2009-12-16 12:54:05.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-backup (Version 2.18.4)
+# spec file for package yast2-backup (Version 2.19.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,13 +19,13 @@
Name: yast2-backup
-Version: 2.18.4
-Release: 2
-License: GPL
-Group: System/YaST
+Version: 2.19.0
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-backup-2.18.4.tar.bz2
+Source0: yast2-backup-2.19.0.tar.bz2
Prefix: /usr
+Group: System/YaST
+License: GPLv2+
Summary: YaST2 - System Backup
BuildArch: noarch
BuildRequires: autoyast2-installation
@@ -67,7 +67,7 @@
backs them up.
%prep
-%setup -n yast2-backup-2.18.4
+%setup -n yast2-backup-2.19.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -77,7 +77,9 @@
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs}
+# V=1: verbose build in case we used AM_SILENT_RULES(yes)
+# so that RPM_OPT_FLAGS check works
+make %{?jobs:-j%jobs} V=1
%install
make install DESTDIR="$RPM_BUILD_ROOT"
++++++ yast2-backup-2.18.4.tar.bz2 -> yast2-backup-2.19.0.tar.bz2 ++++++
++++ 3847 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-backup-2.18.4/autodocs-ycp.ami new/yast2-backup-2.19.0/autodocs-ycp.ami
--- old/yast2-backup-2.18.4/autodocs-ycp.ami 2009-06-22 08:01:25.000000000 +0200
+++ new/yast2-backup-2.19.0/autodocs-ycp.ami 2009-12-03 15:43:04.000000000 +0100
@@ -1,5 +1,5 @@
# -*- makefile -*- Automake include file
-# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $
+# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $
# Builds source documentation for YCP sources
# Uses ycpdoc
@@ -8,20 +8,25 @@
# Optional - the default is $(srcdir)/../../src/*.ycp
# AUTODOCS_PM: Files that the perl autodocs is built from
# Optional - the default is $(srcdir)/../../src/*.pm
+# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs
+# Optional - the default is no subdir, $(docdir)/autodocs
+# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __
+# Optional - the default is $(srcdir)/../../src
-htmldir = $(docdir)/autodocs
+htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs
-html_DATA = index.html $(wildcard *.html)
+html_DATA = index.html $(filter-out index.html, $(wildcard *.html))
CLEANFILES = $(html_DATA) pod2htm*.tmp
AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp)
AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm)
+AUTODOCS_STRIP ?= $(srcdir)/../../src
index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM)
#including *.pm, for the index
- ${YCPDOC} -d. $^
+ ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP)
for i in $(AUTODOCS_PM); do \
- b=`basename $$i`; b=$${b%.pm}; \
+ b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \
pod2html --title=$$b --infile=$$i --outfile=$$b.html; \
- echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \
+ echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \
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-backup-2.18.4/configure.in new/yast2-backup-2.19.0/configure.in
--- old/yast2-backup-2.18.4/configure.in 2009-06-22 08:01:25.000000000 +0200
+++ new/yast2-backup-2.19.0/configure.in 2009-12-03 15:43:04.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-backup
dnl
-dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-backup, 2.18.4, http://bugs.opensuse.org/, yast2-backup)
+AC_INIT(yast2-backup, 2.19.0, http://bugs.opensuse.org/, yast2-backup)
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.18.4"
+VERSION="2.19.0"
RPMNAME="yast2-backup"
MAINTAINER="Lukas Ocilka "
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-backup-2.18.4/missing new/yast2-backup-2.19.0/missing
--- old/yast2-backup-2.18.4/missing 2009-06-22 08:01:28.000000000 +0200
+++ new/yast2-backup-2.19.0/missing 2009-12-03 15:43:08.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see http://www.gnu.org/licenses/.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to ."
exit $?
;;
@@ -106,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
case $1 in
- lex|yacc)
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -138,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -148,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -157,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -187,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -210,7 +218,7 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -240,7 +248,7 @@
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -263,7 +271,7 @@
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -277,11 +285,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -363,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
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-backup-2.18.4/src/backup.ycp new/yast2-backup-2.19.0/src/backup.ycp
--- old/yast2-backup-2.18.4/src/backup.ycp 2009-01-14 16:40:41.000000000 +0100
+++ new/yast2-backup-2.19.0/src/backup.ycp 2009-12-02 16:18:30.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Ladislav Slezak
*
- * $Id: backup.ycp 54631 2009-01-14 15:40:41Z locilka $
+ * $Id: backup.ycp 59904 2009-12-02 15:18:27Z locilka $
*
* Main file for backup module - definition of workflow
*
@@ -20,7 +20,7 @@
y2milestone(" *** Backup module started *** ");
import "Wizard";
-//import "Mode";
+import "Mode";
import "Backup";
import "Report";
import "Sequencer";
@@ -146,6 +146,11 @@
y2milestone("Starting in cron mode");
Backup::cron_mode = true;
+ // BNC #548427: Mode acts like it was in a testsuite
+ // if it actually running in cron mode
+ y2milestone ("Adjusting Mode UI to: commandline");
+ Mode::SetUI ("commandline");
+
if (args[1]:nil != nil)
{
Backup::cron_profile = regexpsub(args[1]:"", "^[ \t]*profile[ \t]*=[ \t]*(.*)", "\\1");
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-backup-2.18.4/src/Backup.ycp new/yast2-backup-2.19.0/src/Backup.ycp
--- old/yast2-backup-2.18.4/src/Backup.ycp 2009-04-08 11:01:19.000000000 +0200
+++ new/yast2-backup-2.19.0/src/Backup.ycp 2009-12-02 16:03:30.000000000 +0100
@@ -10,7 +10,7 @@
*
* Internal
*
- * $Id: Backup.ycp 56677 2009-04-08 09:01:19Z kmachalkova $
+ * $Id: Backup.ycp 59901 2009-12-02 15:03:27Z locilka $
*
* Main file for backup module
*
@@ -1883,10 +1883,10 @@
y2milestone("Old archives: %1", files);
- if (size(files) >= max && max >= 0)
+ if (size(files) > 0 && size(files) >= max && max >= 0)
{
// remove the old archives
- while(size(files) >= max)
+ while(size(files) > 0 && size(files) >= max)
{
string oldarchive = files[size(files) - 1]:"__DUMMY__";
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-backup-2.18.4/src/help_texts.ycp new/yast2-backup-2.19.0/src/help_texts.ycp
--- old/yast2-backup-2.18.4/src/help_texts.ycp 2008-09-22 14:24:05.000000000 +0200
+++ new/yast2-backup-2.19.0/src/help_texts.ycp 2009-11-24 15:14:24.000000000 +0100
@@ -8,7 +8,7 @@
* Authors:
* Ladislav Slezak
*
- * $Id: help_texts.ycp 51356 2008-09-22 12:24:05Z locilka $
+ * $Id: help_texts.ycp 57730 2009-06-24 11:28:18Z locilka $
*
* Help texts used in workflow dialogs
*
@@ -62,7 +62,8 @@
select <B>Custom</B>. Then enter the volume size in <b>Custom Size</b>.</P>")
// For translators: help text in tar options dialog - part 3/3
- + _("<P><B>Note:</B> 1 kB=1000 Bytes, 1 kiB=1024 Bytes, etc.
+ // http://en.wikipedia.org/wiki/Byte
+ + _("<P><B>Note:</B> 1 kB=1000 bytes, 1 KiB=1024 bytes, etc.
The entered volume size will be rounded down to a
multiple of 2048 bytes.</P>");
}
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-backup-2.18.4/VERSION new/yast2-backup-2.19.0/VERSION
--- old/yast2-backup-2.18.4/VERSION 2009-04-08 13:13:42.000000000 +0200
+++ new/yast2-backup-2.19.0/VERSION 2009-12-02 16:03:14.000000000 +0100
@@ -1 +1 @@
-2.18.4
+2.19.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org