Hello community,
here is the log from the commit of package yast2-snapper for openSUSE:Factory
checked in at Mon Jun 27 12:05:23 CEST 2011.
--------
--- yast2-snapper/yast2-snapper.changes 2011-05-30 14:57:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-snapper/yast2-snapper.changes 2011-06-22 12:59:11.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jun 22 12:58:17 CEST 2011 - jsuchome@suse.cz
+
+- added testsuite
+- 2.21.7
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-snapper-2.21.6.tar.bz2
New:
----
yast2-snapper-2.21.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-snapper.spec ++++++
--- /var/tmp/diff_new_pack.G9dLdX/_old 2011-06-27 12:05:04.000000000 +0200
+++ /var/tmp/diff_new_pack.G9dLdX/_new 2011-06-27 12:05:04.000000000 +0200
@@ -19,12 +19,12 @@
Name: yast2-snapper
-Version: 2.21.6
+Version: 2.21.7
Release: 1
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-snapper-2.21.6.tar.bz2
+Source0: yast2-snapper-2.21.7.tar.bz2
Prefix: /usr
@@ -38,7 +38,7 @@
YaST module for accessing and managing btrfs system snapshots
%prep
-%setup -n yast2-snapper-2.21.6
+%setup -n yast2-snapper-2.21.7
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-snapper-2.21.6.tar.bz2 -> yast2-snapper-2.21.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.21.6/configure new/yast2-snapper-2.21.7/configure
--- old/yast2-snapper-2.21.6/configure 2011-05-26 10:37:35.000000000 +0200
+++ new/yast2-snapper-2.21.7/configure 2011-06-22 11:47:39.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-snapper 2.21.5.
+# Generated by GNU Autoconf 2.68 for yast2-snapper 2.21.6.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -709,8 +709,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-snapper'
PACKAGE_TARNAME='yast2-snapper'
-PACKAGE_VERSION='2.21.5'
-PACKAGE_STRING='yast2-snapper 2.21.5'
+PACKAGE_VERSION='2.21.6'
+PACKAGE_STRING='yast2-snapper 2.21.6'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1490,7 +1490,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-snapper 2.21.5 to adapt to many kinds of systems.
+\`configure' configures yast2-snapper 2.21.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1561,7 +1561,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-snapper 2.21.5:";;
+ short | recursive ) echo "Configuration of yast2-snapper 2.21.6:";;
esac
cat <<\_ACEOF
@@ -1675,7 +1675,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-snapper configure 2.21.5
+yast2-snapper configure 2.21.6
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2128,7 +2128,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-snapper $as_me 2.21.5, which was
+It was created by yast2-snapper $as_me 2.21.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3058,7 +3058,7 @@
# Define the identity of the package.
PACKAGE='yast2-snapper'
- VERSION='2.21.5'
+ VERSION='2.21.6'
cat >>confdefs.h <<_ACEOF
@@ -3180,7 +3180,7 @@
-VERSION="2.21.5"
+VERSION="2.21.6"
RPMNAME="yast2-snapper"
MAINTAINER="Jiri Suchomel "
@@ -15994,7 +15994,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-snapper $as_me 2.21.5, which was
+This file was extended by yast2-snapper $as_me 2.21.6, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16060,7 +16060,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-snapper config.status 2.21.5
+yast2-snapper config.status 2.21.6
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-snapper-2.21.6/configure.in new/yast2-snapper-2.21.7/configure.in
--- old/yast2-snapper-2.21.6/configure.in 2011-05-26 10:37:27.000000000 +0200
+++ new/yast2-snapper-2.21.7/configure.in 2011-06-22 11:47:32.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-snapper, 2.21.5, http://bugs.opensuse.org/, yast2-snapper)
+AC_INIT(yast2-snapper, 2.21.6, http://bugs.opensuse.org/, yast2-snapper)
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.5"
+VERSION="2.21.6"
RPMNAME="yast2-snapper"
MAINTAINER="Jiri Suchomel "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.21.6/src/Snapper.ycp new/yast2-snapper-2.21.7/src/Snapper.ycp
--- old/yast2-snapper-2.21.6/src/Snapper.ycp 2011-05-30 14:52:04.000000000 +0200
+++ new/yast2-snapper-2.21.7/src/Snapper.ycp 2011-06-22 12:58:46.000000000 +0200
@@ -23,7 +23,7 @@
* Summary: Snapper settings, input and output functions
* Authors: Jiri Suchomel
*
- * $Id: Snapper.ycp 64143 2011-05-30 12:51:39Z jsuchome $
+ * $Id: Snapper.ycp 64540 2011-06-22 10:58:44Z jsuchome $
*
* Representation of the configuration of snapper.
* Input and output routines.
@@ -89,9 +89,11 @@
map ret = $[];
string file1 = sformat ("%1%2", GetSnapshotPath (old), file);
- string file2 = sformat ("%1%2", GetSnapshotPath (new), file);
- if (new == 0)
- file2 = file;
+ string file2 = file;
+ if (new != 0)
+ {
+ file2 = sformat ("%1%2", GetSnapshotPath (new), file);
+ }
y2milestone ("comparing '%1' and '%2'", file1, file2);
@@ -250,10 +252,13 @@
/**
* Return the given file mode as octal number
*/
-integer GetFileMode (string file) {
+global integer GetFileMode (string file) {
map out = (map) SCR::Execute (.target.bash_output, "/bin/stat --printf=%a " + file);
- return tointeger (out["stdout"]:"755");
+ string mode = out["stdout"]:"";
+ if (mode == nil || mode == "")
+ return 644;
+ return tointeger (mode);
}
/**
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.21.6/testsuite/tests/GetFileMode.out new/yast2-snapper-2.21.7/testsuite/tests/GetFileMode.out
--- old/yast2-snapper-2.21.6/testsuite/tests/GetFileMode.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-snapper-2.21.7/testsuite/tests/GetFileMode.out 2011-06-22 12:25:07.000000000 +0200
@@ -0,0 +1,4 @@
+Execute .target.bash_output "/bin/stat --printf=%a /tmp/1" $["stdout":"755"]
+Return 755
+Execute .target.bash_output "/bin/stat --printf=%a /tmp/2" $["stderr":"/bin/stat: cannot stat `/tmp/2': No such file or directory\n", "stdout":""]
+Return 644
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.21.6/testsuite/tests/GetFileMode.ycp new/yast2-snapper-2.21.7/testsuite/tests/GetFileMode.ycp
--- old/yast2-snapper-2.21.6/testsuite/tests/GetFileMode.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-snapper-2.21.7/testsuite/tests/GetFileMode.ycp 2011-06-22 12:24:25.000000000 +0200
@@ -0,0 +1,23 @@
+{
+ // testedfiles: Snapper.ycp
+
+ import "Snapper";
+ import "Testsuite";
+
+ map EX = $[
+ "target" : $[
+ "bash_output" : $[
+ "stdout" : "755"
+ ],
+ ]
+ ];
+ Testsuite::Test (``(Snapper::GetFileMode ("/tmp/1")), [ $[], $[], EX ], 0);
+
+ EX["target","bash_output"] = $[
+ "stdout" : "",
+ "stderr" : "/bin/stat: cannot stat `/tmp/2': No such file or directory\n"
+ ];
+
+ Testsuite::Test (``(Snapper::GetFileMode ("/tmp/2")), [ $[], $[], EX ], 0);
+
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.21.6/testsuite/tests/GetFileModification.out new/yast2-snapper-2.21.7/testsuite/tests/GetFileModification.out
--- old/yast2-snapper-2.21.6/testsuite/tests/GetFileModification.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-snapper-2.21.7/testsuite/tests/GetFileModification.out 2011-06-22 12:15:49.000000000 +0200
@@ -0,0 +1,13 @@
+Read .snapper.path $["num":1] "/snapshots/1/snapshot"
+Execute .target.bash_output "/usr/bin/diff -u /snapshots/1/snapshot/etc/passwd /etc/passwd" $["stderr":"error while diffing"]
+Log out: $["stderr":"error while diffing"]
+Execute .target.bash_output "ls -ld /snapshots/1/snapshot/etc/passwd /etc/passwd | cut -f 1,3,4 -d ' '" $["stderr":"error while diffing"]
+Return $["diff":"error while diffing", "status":["no_change"]]
+Read .snapper.path $["num":1] "/snapshots/1/snapshot"
+Read .snapper.path $["num":2] "/snapshots/1/snapshot"
+Execute .target.bash_output "/usr/bin/diff -u /snapshots/1/snapshot/etc/passwd /snapshots/1/snapshot/etc/passwd" $["stdout":"+new user line"]
+Execute .target.bash_output "ls -ld /snapshots/1/snapshot/etc/passwd /snapshots/1/snapshot/etc/passwd | cut -f 1,3,4 -d ' '" $["stdout":"+new user line"]
+Return $["diff":"+new user line", "group1":"line", "group2":"", "mode1":"+new", "mode2":"", "status":["diff", "mode", "user", "group"], "user1":"user", "user2":""]
+Read .snapper.path $["num":1] "/snapshots/1/snapshot"
+Read .snapper.path $["num":2] "/snapshots/1/snapshot"
+Return $["status":["none"]]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.21.6/testsuite/tests/GetFileModification.ycp new/yast2-snapper-2.21.7/testsuite/tests/GetFileModification.ycp
--- old/yast2-snapper-2.21.6/testsuite/tests/GetFileModification.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-snapper-2.21.7/testsuite/tests/GetFileModification.ycp 2011-06-22 12:14:08.000000000 +0200
@@ -0,0 +1,35 @@
+{
+ // testedfiles: Snapper.ycp
+
+ import "Snapper";
+ import "Testsuite";
+
+ map READ = $[
+ "snapper" : $[
+ "path" : "/snapshots/1/snapshot"
+ ],
+ "target" : $[
+ "stat" : $[
+ 1 : 2
+ ]
+ ],
+ ];
+ map EX = $[
+ "target" : $[
+ "bash_output" : $[
+ "stderr" : "error while diffing"
+ ]
+ ],
+ ];
+ Testsuite::Test (``(Snapper::GetFileModification ("/etc/passwd", 1, 0)), [ READ, $[], EX ], 0);
+
+ EX["target","bash_output"] = $[
+ "stdout" : "+new user line"
+ ];
+ // status map is wrong, due to 2 calls of target.bash_output with same result...
+ Testsuite::Test (``(Snapper::GetFileModification ("/etc/passwd", 1, 2)), [ READ, $[], EX ], 0);
+
+ READ["target","stat"] = $[];
+
+ Testsuite::Test (``(Snapper::GetFileModification ("/etc/passwd", 1, 2)), [ READ, $[], EX ], 0);
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.21.6/testsuite/tests/GetSnapshotPath.out new/yast2-snapper-2.21.7/testsuite/tests/GetSnapshotPath.out
--- old/yast2-snapper-2.21.6/testsuite/tests/GetSnapshotPath.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-snapper-2.21.7/testsuite/tests/GetSnapshotPath.out 2011-06-22 12:09:45.000000000 +0200
@@ -0,0 +1,4 @@
+Read .snapper.path $["num":0] nil
+Return
+Read .snapper.path $["num":0] "/snapshots/0/snapshot"
+Return /snapshots/0/snapshot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.21.6/testsuite/tests/GetSnapshotPath.ycp new/yast2-snapper-2.21.7/testsuite/tests/GetSnapshotPath.ycp
--- old/yast2-snapper-2.21.6/testsuite/tests/GetSnapshotPath.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-snapper-2.21.7/testsuite/tests/GetSnapshotPath.ycp 2011-06-22 12:04:56.000000000 +0200
@@ -0,0 +1,17 @@
+{
+ // testedfiles: Snapper.ycp
+
+ import "Snapper";
+ import "Testsuite";
+
+ map READ = $[
+ "snapper" : $[
+ "path" : nil
+ ]
+ ];
+ Testsuite::Test (``(Snapper::GetSnapshotPath (0)), [ READ, $[], $[] ], 0);
+
+ READ["snapper","path"] = "/snapshots/0/snapshot";
+
+ Testsuite::Test (``(Snapper::GetSnapshotPath (0)), [ READ, $[], $[] ], 0);
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.21.6/testsuite/tests/ReadSnapshots.out new/yast2-snapper-2.21.7/testsuite/tests/ReadSnapshots.out
--- old/yast2-snapper-2.21.6/testsuite/tests/ReadSnapshots.out 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-snapper-2.21.7/testsuite/tests/ReadSnapshots.out 2011-06-22 11:27:12.000000000 +0200
@@ -0,0 +1,7 @@
+Read .snapper.snapshots nil
+Return true
+Return []
+Read .snapper.snapshots [$["date":1297364138, "description":"current system", "num":0, "type":`SINGLE], $["date":1297364138, "description":"before yast2-users", "num":1, "post_num":2, "type":`PRE]]
+Return true
+Return [$["date":1297364138, "description":"before yast2-users", "name":"1", "num":1, "post_num":2, "type":`PRE]]
+Return $[1:0]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.21.6/testsuite/tests/ReadSnapshots.ycp new/yast2-snapper-2.21.7/testsuite/tests/ReadSnapshots.ycp
--- old/yast2-snapper-2.21.6/testsuite/tests/ReadSnapshots.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-snapper-2.21.7/testsuite/tests/ReadSnapshots.ycp 2011-06-22 11:26:10.000000000 +0200
@@ -0,0 +1,36 @@
+{
+ // testedfiles: Snapper.ycp
+
+ import "Testsuite";
+ import "Snapper";
+
+ map READ = $[
+ "snapper" : $[
+ "snapshots" : nil
+ ]
+ ];
+
+ Testsuite::Test (``(Snapper::ReadSnapshots ()), [ READ, $[], $[] ], 0);
+ Testsuite::Test (``(Snapper::snapshots), [ READ, $[], $[] ], 0);
+
+ READ["snapper","snapshots"] = [
+ $[
+ "date" : 1297364138,
+ "description" : "current system",
+ "num" : 0,
+ "type" : `SINGLE
+ ],
+ $[
+ "date" : 1297364138,
+ "description" : "before yast2-users",
+ "num" : 1,
+ "post_num" : 2,
+ "type" : `PRE
+ ]
+ ];
+
+ Testsuite::Test (``(Snapper::ReadSnapshots ()), [ READ, $[], $[] ], 0);
+ Testsuite::Test (``(Snapper::snapshots), [ READ, $[], $[] ], 0);
+ Testsuite::Test (``(Snapper::id2index), [ READ, $[], $[] ], 0);
+
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-snapper-2.21.6/VERSION new/yast2-snapper-2.21.7/VERSION
--- old/yast2-snapper-2.21.6/VERSION 2011-05-30 14:55:40.000000000 +0200
+++ new/yast2-snapper-2.21.7/VERSION 2011-06-22 12:58:27.000000000 +0200
@@ -1 +1 @@
-2.21.6
+2.21.7
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org