Hello community,
here is the log from the commit of package yast2-restore
checked in at Tue Aug 28 18:10:29 CEST 2007.
--------
--- yast2-restore/yast2-restore.changes 2007-07-30 17:48:29.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-restore/yast2-restore.changes 2007-08-28 16:08:31.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Aug 28 16:07:23 CEST 2007 - locilka@suse.cz
+
+- Fixed restoration in autoyast (#199657).
+- 2.15.3
+
+-------------------------------------------------------------------
Old:
----
yast2-restore-2.15.2.tar.bz2
New:
----
yast2-restore-2.15.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-restore.spec ++++++
--- /var/tmp/diff_new_pack.m15235/_old 2007-08-28 18:09:51.000000000 +0200
+++ /var/tmp/diff_new_pack.m15235/_new 2007-08-28 18:09:51.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-restore (Version 2.15.2)
+# spec file for package yast2-restore (Version 2.15.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-restore
-Version: 2.15.2
+Version: 2.15.3
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-restore-2.15.2.tar.bz2
+Source0: yast2-restore-2.15.3.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-bootloader yast2-devtools yast2-testsuite
Requires: aaa_base
@@ -39,7 +39,7 @@
Ladislav Slezak
%prep
-%setup -n yast2-restore-2.15.2
+%setup -n yast2-restore-2.15.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -75,6 +75,9 @@
%doc %{prefix}/share/doc/packages/yast2-restore
%changelog
+* Tue Aug 28 2007 - locilka@suse.cz
+- Fixed restoration in autoyast (#199657).
+- 2.15.3
* Mon Jul 30 2007 - locilka@suse.cz
- 2.15.2
* Fri May 25 2007 - jsrain@suse.cz
++++++ yast2-restore-2.15.2.tar.bz2 -> yast2-restore-2.15.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.15.2/configure new/yast2-restore-2.15.3/configure
--- old/yast2-restore-2.15.2/configure 2007-07-04 14:00:37.000000000 +0200
+++ new/yast2-restore-2.15.3/configure 2007-08-28 16:21:06.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-restore 2.15.1.
+# Generated by GNU Autoconf 2.60 for yast2-restore 2.15.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-restore'
PACKAGE_TARNAME='yast2-restore'
-PACKAGE_VERSION='2.15.1'
-PACKAGE_STRING='yast2-restore 2.15.1'
+PACKAGE_VERSION='2.15.3'
+PACKAGE_STRING='yast2-restore 2.15.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,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-restore 2.15.1 to adapt to many kinds of systems.
+\`configure' configures yast2-restore 2.15.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-restore 2.15.1:";;
+ short | recursive ) echo "Configuration of yast2-restore 2.15.3:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-restore configure 2.15.1
+yast2-restore configure 2.15.3
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,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-restore $as_me 2.15.1, which was
+It was created by yast2-restore $as_me 2.15.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-restore'
- VERSION='2.15.1'
+ VERSION='2.15.3'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.1"
+VERSION="2.15.3"
RPMNAME="yast2-restore"
MAINTAINER="Lukas Ocilka "
@@ -3258,7 +3258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-restore $as_me 2.15.1, which was
+This file was extended by yast2-restore $as_me 2.15.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-restore config.status 2.15.1
+yast2-restore config.status 2.15.3
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.15.2/configure.in new/yast2-restore-2.15.3/configure.in
--- old/yast2-restore-2.15.2/configure.in 2007-07-04 14:00:32.000000000 +0200
+++ new/yast2-restore-2.15.3/configure.in 2007-08-28 16:20:59.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-restore
dnl
-dnl -- This file is generated by y2autoconf 2.15.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-restore, 2.15.1, http://bugs.opensuse.org/, yast2-restore)
+AC_INIT(yast2-restore, 2.15.3, http://bugs.opensuse.org/, yast2-restore)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.1"
+VERSION="2.15.3"
RPMNAME="yast2-restore"
MAINTAINER="Lukas Ocilka "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.15.2/Makefile.am new/yast2-restore-2.15.3/Makefile.am
--- old/yast2-restore-2.15.2/Makefile.am 2007-07-04 14:00:32.000000000 +0200
+++ new/yast2-restore-2.15.3/Makefile.am 2007-08-28 16:21:00.000000000 +0200
@@ -210,8 +210,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
SUBDIRS = agents doc src testsuite
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.15.2/Makefile.in new/yast2-restore-2.15.3/Makefile.in
--- old/yast2-restore-2.15.2/Makefile.in 2007-07-04 14:00:38.000000000 +0200
+++ new/yast2-restore-2.15.3/Makefile.in 2007-08-28 16:21:08.000000000 +0200
@@ -233,8 +233,7 @@
@CREATE_PKGCONFIG_NOARCH_TRUE@@CREATE_PKGCONFIG_TRUE@pkgconfigdata_DATA = $(RPMNAME).pc
@CREATE_PKGCONFIG_NOARCH_FALSE@@CREATE_PKGCONFIG_TRUE@pkgconfig_DATA = $(RPMNAME).pc
TAGVERSION = $(Y2TOOL) tagversion
-# test ! -d $(srcdir)/po \
-# || { $(MAKE) -C po checkpo && $(MAKE) -C po make-pox; }
+# test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo make-pox
# No ./SUBDIRS file found - assuming default: All direct subdirs with Makefile.am
SUBDIRS = agents doc src testsuite
all: all-recursive
@@ -841,7 +840,7 @@
# For po/ modules
checkpo:
- test ! -d $(srcdir)/po || $(MAKE) -C po checkpo
+ test ! -f $(srcdir)/po/Makefile || $(MAKE) -C po checkpo
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.15.2/src/restore_auto.ycp new/yast2-restore-2.15.3/src/restore_auto.ycp
--- old/yast2-restore-2.15.2/src/restore_auto.ycp 2007-05-18 10:43:25.000000000 +0200
+++ new/yast2-restore-2.15.3/src/restore_auto.ycp 2007-08-28 16:20:52.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Client for autoinstallation
* Authors: Ladislav Slezak
*
- * $Id: restore_auto.ycp 19480 2004-09-20 12:57:18Z lslezak $
+ * $Id: restore_auto.ycp 40546 2007-08-28 14:20:52Z locilka $
*
* This is a client for autoinstallation.
* Does not do any changes to the configuration.
@@ -19,6 +19,9 @@
import "Popup";
import "Restore";
import "Wizard";
+import "Directory";
+import "FileUtils";
+
include "restore/ui.ycp";
/* The main () */
@@ -29,6 +32,7 @@
string func = "";
map param = $[];
+string filename = sformat ("%1/restore_archives_tmpfile.ycp", Directory::tmpdir);
/* Check arguments */
if (size(WFM::Args()) > 0 && is(WFM::Args(0), string))
@@ -48,6 +52,13 @@
if (func == "Import")
{
ret = Restore::Import(param);
+
+ if (FileUtils::Exists (filename)) {
+ SCR::Execute (.target.remove, filename);
+ }
+
+ // bugzilla #199657
+ SCR::Write (.target.ycp, filename, param["archives"]:[]);
}
/* create a summary */
else if (func == "Summary")
@@ -77,7 +88,18 @@
import "Progress";
// Read archive file
- list<string> volumes = param["archives"]:[];
+ list <string> volumes = [];
+
+ // bugzilla #199657
+ if (param["archives"]:[] != []) {
+ y2milestone ("Some volumes set");
+ volumes = param["archives"]:[];
+ } else if (FileUtils::Exists (filename)) {
+ y2milestone ("Reading volumes from tmpfile");
+ volumes = (list <string>) SCR::Read (.target.ycp, filename);
+ }
+
+ y2milestone ("Volumes: %1", volumes);
if (size(volumes) == 0)
{
@@ -91,6 +113,8 @@
integer index = 0;
foreach(string volume, volumes, ``{
+ y2milestone ("Scanning volume %1", volume);
+
if (ui == `abort)
{
ret = false;
@@ -106,6 +130,7 @@
map read_result = Restore::ReadNextVolume(volume);
read = (boolean)(read_result["success"]:false);
}
+ y2milestone ("Reading volume %1 returned %2", volume, read);
if (read == false)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.15.2/VERSION new/yast2-restore-2.15.3/VERSION
--- old/yast2-restore-2.15.2/VERSION 2007-07-30 17:48:12.000000000 +0200
+++ new/yast2-restore-2.15.3/VERSION 2007-08-28 16:08:36.000000000 +0200
@@ -1 +1 @@
-2.15.2
+2.15.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org