Hello community,
here is the log from the commit of package yast2-backup for openSUSE:Factory
checked in at 2012-01-17 11:35:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-backup (Old)
and /work/SRC/openSUSE:Factory/.yast2-backup.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-backup", Maintainer is "loci...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-backup/yast2-backup.changes
2011-10-19 00:56:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-backup.new/yast2-backup.changes
2012-01-17 16:17:25.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Jan 13 15:53:45 CET 2012 - loci...@suse.cz
+
+- Fixed parsing output from verification of packages (bnc #736233)
+- 2.22.0
+
+-------------------------------------------------------------------
Old:
----
yast2-backup-2.21.3.tar.bz2
New:
----
yast2-backup-2.22.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-backup.spec ++++++
--- /var/tmp/diff_new_pack.Hb0RZB/_old 2012-01-17 16:17:29.000000000 +0100
+++ /var/tmp/diff_new_pack.Hb0RZB/_new 2012-01-17 16:17:29.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-backup
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,11 @@
Name: yast2-backup
-Version: 2.21.3
+Version: 2.22.0
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-backup-2.21.3.tar.bz2
-
-Prefix: /usr
+Source0: yast2-backup-%{version}.tar.bz2
Group: System/YaST
License: GPL-2.0+
@@ -76,26 +74,26 @@
backs them up.
%prep
-%setup -n yast2-backup-2.21.3
+%setup -n yast2-backup-%{version}
%build
-%{prefix}/bin/y2tool y2autoconf
-%{prefix}/bin/y2tool y2automake
+%{_prefix}/bin/y2tool y2autoconf
+%{_prefix}/bin/y2tool y2automake
autoreconf --force --install
export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
%{?suse_update_config:%{suse_update_config -f}}
-./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir}
+./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir}
# 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"
-[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] ||
Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
-for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name
"*.desktop"` ; do
+[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] ||
Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT"
+for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name
"*.desktop"` ; do
d=${f##*/}
%suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop}
done
@@ -112,10 +110,10 @@
/usr/share/YaST2/scrconf/cfg_backup.scr
/usr/share/YaST2/include/backup/*
/usr/share/YaST2/clients/backup*.ycp
-%{prefix}/lib/YaST2/bin/backup_*
+%{_prefix}/lib/YaST2/bin/backup_*
/usr/share/YaST2/modules/Backup.ycp
/usr/share/YaST2/modules/Backup.ybc
-%{prefix}/share/applications/YaST2/backup.desktop
-%doc %{prefix}/share/doc/packages/yast2-backup
+%{_prefix}/share/applications/YaST2/backup.desktop
+%doc %{_prefix}/share/doc/packages/yast2-backup
%changelog
++++++ yast2-backup-2.21.3.tar.bz2 -> yast2-backup-2.22.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-backup-2.21.3/Makefile.am
new/yast2-backup-2.22.0/Makefile.am
--- old/yast2-backup-2.21.3/Makefile.am 2011-10-14 12:48:52.000000000 +0200
+++ new/yast2-backup-2.22.0/Makefile.am 2012-01-13 15:57:26.000000000 +0100
@@ -20,7 +20,6 @@
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
@@ -155,7 +154,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
TAGVERSION = $(Y2TOOL) tagversion
@@ -185,21 +184,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-backup-2.21.3/Makefile.in
new/yast2-backup-2.22.0/Makefile.in
--- old/yast2-backup-2.21.3/Makefile.in 2011-10-14 12:48:55.000000000 +0200
+++ new/yast2-backup-2.22.0/Makefile.in 2012-01-13 15:57:28.000000000 +0100
@@ -261,7 +261,6 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
-ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
COPYRIGHT_files_gpl = README COPYING
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
@@ -902,7 +901,7 @@
$(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \
done
-package: check-up-to-date check-tagversion check-all-packages check-textdomain
package-local
+package: check-up-to-date check-tagversion check-textdomain package-local
check-up-to-date check-cvs-up-to-date check-svn-up-to-date:
if [ -d $(srcdir)/CVS ]; then \
@@ -930,21 +929,6 @@
check-parse:
@echo "Not running parseycp."
-check-all-packages:
- @if [ ! -e "$(ALL_PACKAGES)" ]; then \
- echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \
- fi
- @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then
\
- echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \
- fi
- @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \
- echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some
unknown (?) fields:"; \
- echo; \
- grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \
- echo; \
- false; \
- fi
-
check-textdomain:
$(Y2TOOL) check-textdomain $(srcdir)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-backup-2.21.3/VERSION
new/yast2-backup-2.22.0/VERSION
--- old/yast2-backup-2.21.3/VERSION 2011-10-14 12:51:31.000000000 +0200
+++ new/yast2-backup-2.22.0/VERSION 2012-01-13 15:53:30.000000000 +0100
@@ -1 +1 @@
-2.21.3
+2.22.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-backup-2.21.3/configure
new/yast2-backup-2.22.0/configure
--- old/yast2-backup-2.21.3/configure 2011-10-14 12:48:54.000000000 +0200
+++ new/yast2-backup-2.22.0/configure 2012-01-13 15:57:28.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-backup 2.21.1.
+# Generated by GNU Autoconf 2.68 for yast2-backup 2.22.0.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-backup'
PACKAGE_TARNAME='yast2-backup'
-PACKAGE_VERSION='2.21.1'
-PACKAGE_STRING='yast2-backup 2.21.1'
+PACKAGE_VERSION='2.22.0'
+PACKAGE_STRING='yast2-backup 2.22.0'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,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 yast2-backup 2.21.1 to adapt to many kinds of systems.
+\`configure' configures yast2-backup 2.22.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1300,7 +1300,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-backup 2.21.1:";;
+ short | recursive ) echo "Configuration of yast2-backup 2.22.0:";;
esac
cat <<\_ACEOF
@@ -1380,7 +1380,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-backup configure 2.21.1
+yast2-backup configure 2.22.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1397,7 +1397,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-backup $as_me 2.21.1, which was
+It was created by yast2-backup $as_me 2.22.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2327,7 +2327,7 @@
# Define the identity of the package.
PACKAGE='yast2-backup'
- VERSION='2.21.1'
+ VERSION='2.22.0'
cat >>confdefs.h <<_ACEOF
@@ -2449,7 +2449,7 @@
-VERSION="2.21.1"
+VERSION="2.22.0"
RPMNAME="yast2-backup"
MAINTAINER="Lukas Ocilka <loci...@suse.cz>"
@@ -3379,7 +3379,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-backup $as_me 2.21.1, which was
+This file was extended by yast2-backup $as_me 2.22.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3432,7 +3432,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-backup config.status 2.21.1
+yast2-backup config.status 2.22.0
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/yast2-backup-2.21.3/configure.in
new/yast2-backup-2.22.0/configure.in
--- old/yast2-backup-2.21.3/configure.in 2011-10-14 12:48:52.000000000
+0200
+++ new/yast2-backup-2.22.0/configure.in 2012-01-13 15:57:26.000000000
+0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-backup
dnl
-dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-backup, 2.21.1, http://bugs.opensuse.org/, yast2-backup)
+AC_INIT(yast2-backup, 2.22.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.21.1"
+VERSION="2.22.0"
RPMNAME="yast2-backup"
MAINTAINER="Lukas Ocilka <loci...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-backup-2.21.3/src/scripts/backup_search.pl
new/yast2-backup-2.22.0/src/scripts/backup_search.pl
--- old/yast2-backup-2.21.3/src/scripts/backup_search.pl 2009-11-24
15:14:24.000000000 +0100
+++ new/yast2-backup-2.22.0/src/scripts/backup_search.pl 2012-01-13
15:55:46.000000000 +0100
@@ -16,7 +16,7 @@
# package. Output is list of files and optional more
# information about progress of search.
#
-# $Id: backup_search.pl 52368 2008-10-20 14:16:21Z locilka $
+# $Id: backup_search.pl 67195 2012-01-13 14:55:44Z locilka $
#
use Getopt::Long;
@@ -25,9 +25,9 @@
#function prototypes
sub ReadAllPackages();
sub FsToDirs(@);
-sub ReadAllFiles(%%);
-sub VerifyPackages(@%%);
-sub SearchDirectory($%%%);
+sub ReadAllFiles;
+sub VerifyPackages;
+sub SearchDirectory;
# command line options
my $search_files = 0;
@@ -453,6 +453,21 @@
}
}
+sub split_rpm_verify ($) {
+ # format of the line:
+ # _9_chars_with_changed_attrs_ _1_char_file_type_ /changed/file/name
+ #
+ # example:
+ # 5S.T..... c /etc/ssh/sshd_config
+ my $verify_output_line = shift;
+
+ my $rpmout = substr($verify_output_line, 0, 9);
+ my $filename = $verify_output_line;
+ $filename =~ s/^.{9}[^\/]+//;
+
+ return ($rpmout, $filename);
+}
+
# Check file and return whether to backup or not
sub CheckFile {
my $line = shift;
@@ -470,25 +485,26 @@
my $backup = 1;
my $file_size = 0;
- $link = ($$line =~ /^....L.* (\/.*)/);
+ my ($verify_out, $filename) = split_rpm_verify ($$line);
+ $link = ($verify_out =~ /L/);
if ($link)
{
- $file = $1;
+ $file = $filename;
}
if ($no_md5)
{
- $size = ($$line =~ /^S.* (\/.*)/);
+ $size = ($verify_out =~ /S/);
if ($size)
{
- $file = $1;
+ $file = $filename;
}
- $mtime = ($$line =~ /^\..{6}T.* (\/.*)/);
+ $mtime = ($verify_out =~ /T/);
if ($mtime)
{
- $file = $1;
+ $file = $filename;
}
@@ -529,7 +545,8 @@
{
while (my $fl = <RPMVRF>)
{
- if (($fl !~ /^S.* \/./) and ($fl !~
/^\..{6}T.* \/.*/) and ($fl !~ /^..5.* \/.*/))
+ my ($vo, $fn) = split_rpm_verify ($fl);
+ if (($vo !~ /S/) and ($vo !~ /T/) and
($vo !~ /5/))
{
$backup = 0;
}
@@ -545,10 +562,11 @@
}
else
{
- $md5_test = ($$line =~ /^..5.* (\/.*)/);
+ my ($rpmout, $filename) = split_rpm_verify($$line);
+ $md5_test = ($rpmout =~ /5/);
if ($md5_test)
{
- $file = $1;
+ $file = $filename;
}
}
@@ -563,7 +581,7 @@
}
# verify each package in the list
-sub VerifyPackages(@%%) {
+sub VerifyPackages() {
my ($packages, $unavail, $duplicates) = @_;
# rpm -q --filesbypkg @all-rpm-packages
@@ -635,7 +653,7 @@
# read all files which belong to packages
-sub ReadAllFiles(%%)
+sub ReadAllFiles()
{
my ($all_files, $pkg_inodes) = @_;
my %duplicates;
@@ -731,7 +749,7 @@
}
# search files which do not belong to any package
-sub SearchDirectory($%%%)
+sub SearchDirectory()
{
my ($dir, $files, $exclude, $inodes) = @_;
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
