Hello community, here is the log from the commit of package yast2-backup for openSUSE:Factory checked in at Tue Oct 4 17:04:22 CEST 2011.
-------- --- openSUSE:Factory/yast2-backup/yast2-backup.changes 2011-09-23 12:53:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-backup/yast2-backup.changes 2011-09-28 19:57:36.000000000 +0200 @@ -0,0 +1,32 @@ +------------------------------------------------------------------- +Wed Sep 28 19:56:34 CEST 2011 - [email protected] + +- set dialog title +- 2.21.2 + +------------------------------------------------------------------- +Fri Sep 23 11:54:55 UTC 2011 - [email protected] + +- use Pkg::ResolvableProperties() instead of obsoleted + Pkg::TargetProducts() +- 2.21.1 + +------------------------------------------------------------------- +Fri Aug 5 12:30:50 CEST 2011 - [email protected] + +- fixed .desktop file (bnc #681249) + +------------------------------------------------------------------ +Fri Jun 24 13:13:06 CEST 2011 - [email protected] + +- Enhanced dialog and help for automatic backup - emphasized the + fact that all backups are full backups (BNC #698802). +- 2.21.0 + +------------------------------------------------------------------ +Thu Jun 23 16:39:40 CEST 2011 - [email protected] + +- Fixed handling /etc/mtab while creating backup archive on NFS + share. Archive must contain the mtab file without a temporary + NFS entry, otherwise it breaks during restoration (BNC #675259). + calling whatdependson for head-i586 Old: ---- yast2-backup-2.20.2.tar.bz2 New: ---- yast2-backup-2.21.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-backup.spec ++++++ --- /var/tmp/diff_new_pack.xw3ysN/_old 2011-10-04 17:04:18.000000000 +0200 +++ /var/tmp/diff_new_pack.xw3ysN/_new 2011-10-04 17:04:18.000000000 +0200 @@ -19,16 +19,16 @@ Name: yast2-backup -Version: 2.20.2 -Release: 2 +Version: 2.21.2 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-backup-2.20.2.tar.bz2 +Source0: yast2-backup-%{version}.tar.bz2 Prefix: /usr Group: System/YaST -License: GPLv2+ +License: GPL v2 or later Summary: YaST2 - System Backup BuildArch: noarch @@ -52,7 +52,7 @@ Requires: perl Requires: tar Requires: util-linux -Requires: yast2 +Requires: yast2 >= 2.21.22 Requires: yast2-nfs-client Requires: yast2-storage # ag_freespace @@ -76,7 +76,7 @@ backs them up. %prep -%setup -n yast2-backup-2.20.2 +%setup -n yast2-backup-%{version} %build %{prefix}/bin/y2tool y2autoconf @@ -117,4 +117,5 @@ /usr/share/YaST2/modules/Backup.ybc %{prefix}/share/applications/YaST2/backup.desktop %doc %{prefix}/share/doc/packages/yast2-backup + %changelog ++++++ yast2-backup-2.20.2.tar.bz2 -> yast2-backup-2.21.2.tar.bz2 ++++++ ++++ 4557 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.20.2/Makefile.am new/yast2-backup-2.21.2/Makefile.am --- old/yast2-backup-2.20.2/Makefile.am 2011-01-10 16:38:23.000000000 +0100 +++ new/yast2-backup-2.21.2/Makefile.am 2011-09-28 19:55:50.000000000 +0200 @@ -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' --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.20.2/VERSION new/yast2-backup-2.21.2/VERSION --- old/yast2-backup-2.20.2/VERSION 2011-01-10 16:36:31.000000000 +0100 +++ new/yast2-backup-2.21.2/VERSION 2011-09-28 19:56:17.000000000 +0200 @@ -1 +1 @@ -2.20.2 +2.21.2 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.20.2/configure.in new/yast2-backup-2.21.2/configure.in --- old/yast2-backup-2.20.2/configure.in 2011-01-10 16:38:23.000000000 +0100 +++ new/yast2-backup-2.21.2/configure.in 2011-09-28 19:55:50.000000000 +0200 @@ -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.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-backup, 2.20.2, http://bugs.opensuse.org/, yast2-backup) +AC_INIT(yast2-backup, 2.21.1, 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.20.2" +VERSION="2.21.1" RPMNAME="yast2-backup" MAINTAINER="Lukas Ocilka <[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-backup-2.20.2/src/Backup.ycp new/yast2-backup-2.21.2/src/Backup.ycp --- old/yast2-backup-2.20.2/src/Backup.ycp 2011-01-07 14:21:14.000000000 +0100 +++ new/yast2-backup-2.21.2/src/Backup.ycp 2011-09-28 19:55:16.000000000 +0200 @@ -10,7 +10,7 @@ * * Internal * - * $Id: Backup.ycp 63129 2011-01-07 13:21:13Z locilka $ + * $Id: Backup.ycp 64565 2011-06-23 14:43:21Z locilka $ * * Main file for backup module * @@ -30,6 +30,8 @@ import "FileUtils"; import "String"; import "Service"; +import "Directory"; +import "String"; include "backup/functions.ycp"; @@ -463,13 +465,90 @@ } /** + * When creating backup on NFS share, /etc/mtab is modified after mounting the NFS + * share to a temporary directory. This causes problems later after restoring + * the backup because mountpoint was only temporary and doesn't exist anymore. + * + * See BNC #675259 + */ +string temporary_mtab_file = sformat("%1/temporary_mtab_file", Directory::tmpdir); +string mtab_file = "/etc/mtab"; + +/** + * Stores the content of /etc/mtab to a 'safe place' + */ +boolean BackupMtab () { + // nothing to backup + if (! FileUtils::Exists (mtab_file)) { + y2error ("There is no mtab file!"); + return false; + } + + y2milestone ("Creating backup of %1 to %2\n---\n%3\n---", + mtab_file, temporary_mtab_file, + SCR::Execute (.target.bash_output, sformat ("cat '%1'", String::Quote (mtab_file))) + ); + + // creating backup by `cat` - the original file attributes are kept intact + if ((integer) SCR::Execute (.target.bash, + sformat ("cat '%1' > '%2'", String::Quote (mtab_file), String::Quote (temporary_mtab_file)) + ) != 0) { + y2error ("Cannot backup %1 to %2", mtab_file, temporary_mtab_file); + return false; + } + + return true; +} + +/** + * Restores the original content of /etc/mtab + */ +boolean RestoreMtab () { + // nothing to restore from + if (! FileUtils::Exists (temporary_mtab_file)) { + y2error ("There is no mtab file (%1) to restore", temporary_mtab_file); + return false; + } + + y2milestone ("Restoring backup of %1 from %2", mtab_file, temporary_mtab_file); + + // restoring by `cat` - the original file attributes are kept intact + if ((integer) SCR::Execute (.target.bash, + sformat ("cat '%1' > '%2'", String::Quote (temporary_mtab_file), String::Quote (mtab_file)) + ) != 0) { + y2error ("Cannot restore content of %1 to %2", temporary_mtab_file, mtab_file); + return false; + } + + y2milestone ("Current %1 file contains\n---\n%2\n---", + mtab_file, + SCR::Execute (.target.bash_output, sformat ("cat '%1'", String::Quote (mtab_file))) + ); + + // cleaning up + if ((integer) SCR::Execute (.target.bash, sformat ("rm -f '%1'", temporary_mtab_file)) != 0) { + y2error ("Cannot remove temporary mtab file %1", temporary_mtab_file); + return false; + } + + return true; +} + +/** * Pre-backup function - mount NFS share if required * @return boolean true on success */ global define boolean PrepareBackup() ``{ if (target_type == `nfs && nfsmount == nil) { + // BNC #675259: Backup /etc/mtab before it's changed by mounting a NFS share + BackupMtab(); + nfsmount = Nfs::Mount(nfsserver, nfsexport, nil, "", ""); + + // BNC #675259: Restore backup of /etc/mtab before the backup archive is created + RestoreMtab(); + return nfsmount != nil; } 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.20.2/src/backup.desktop new/yast2-backup-2.21.2/src/backup.desktop --- old/yast2-backup-2.20.2/src/backup.desktop 2010-01-15 11:13:54.000000000 +0100 +++ new/yast2-backup-2.21.2/src/backup.desktop 2011-09-28 19:55:16.000000000 +0200 @@ -3,7 +3,6 @@ Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-System; X-KDE-ModuleType=Library -X-KDE-RootOnly=true X-KDE-HasReadOnlyMode=true X-KDE-Library=yast2 X-SuSE-YaST-Call=backup 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.20.2/src/backup.ycp new/yast2-backup-2.21.2/src/backup.ycp --- old/yast2-backup-2.20.2/src/backup.ycp 2009-12-02 16:18:30.000000000 +0100 +++ new/yast2-backup-2.21.2/src/backup.ycp 2011-09-28 19:57:07.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Ladislav Slezak <[email protected]> * - * $Id: backup.ycp 59904 2009-12-02 15:18:27Z locilka $ + * $Id: backup.ycp 66109 2011-09-28 17:57:05Z visnov $ * * Main file for backup module - definition of workflow * @@ -169,7 +169,7 @@ // create wizard dialog Wizard::CreateDialog(); // set icon - Wizard::SetTitleIcon("yast-backup"); + Wizard::SetDesktopTitleAndIcon("backup"); } Backup::ReadBackupProfiles(); 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.20.2/src/backup_get_packages.ycp new/yast2-backup-2.21.2/src/backup_get_packages.ycp --- old/yast2-backup-2.20.2/src/backup_get_packages.ycp 2009-11-24 15:14:24.000000000 +0100 +++ new/yast2-backup-2.21.2/src/backup_get_packages.ycp 2011-09-28 19:55:16.000000000 +0200 @@ -9,7 +9,7 @@ * Ladislav Slezak <[email protected]> * Lukas Ocilka <[email protected]> * - * $Id: backup_get_packages.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: backup_get_packages.ycp 65976 2011-09-23 11:56:53Z lslezak $ * * Client for returning available packages. * Client used by backup module. This should save memory. @@ -54,7 +54,8 @@ y2milestone("availables sources: %1", sources); // list of installed products (last installed is first in the list) - list installed_products = Pkg::TargetProducts(); + list<map> installed_products = Pkg::ResolvableProperties("", `product, ""); + installed_products = filter(map p, installed_products, {return p["status"]:`none == `installed;}); y2milestone("installed products: %1", installed_products); // installation sources for installed products 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.20.2/src/help_texts.ycp new/yast2-backup-2.21.2/src/help_texts.ycp --- old/yast2-backup-2.20.2/src/help_texts.ycp 2009-11-24 15:14:24.000000000 +0100 +++ new/yast2-backup-2.21.2/src/help_texts.ycp 2011-09-28 19:55:16.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Ladislav Slezak <[email protected]> * - * $Id: help_texts.ycp 57730 2009-06-24 11:28:18Z locilka $ + * $Id: help_texts.ycp 64586 2011-06-24 11:15:20Z locilka $ * * Help texts used in workflow dialogs * @@ -192,10 +192,11 @@ backup should be started. Use the 24-hour clock format for <b>Hour</b>.</P>") // For translators: help text in the automatic backup dialog (3/4) - + _("<P>The previous backup archive, if it exists, will be renamed by + + _("<P>The previous full backup archive, if it exists, will be renamed by putting the date in the form YYYYMMDDHHMMSS at the beginning of the filename. If the number of old archives is greater than the predefined -value, the oldest archives are deleted.</P>") +value, the oldest archives are deleted. All archives are stored +as <b>full backups</b>.</P>") // For translators: help text in automatic backup dialog (4/4) + _("<p>For the root user to receive information about the backup, 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.20.2/src/ui.ycp new/yast2-backup-2.21.2/src/ui.ycp --- old/yast2-backup-2.20.2/src/ui.ycp 2011-01-10 16:36:40.000000000 +0100 +++ new/yast2-backup-2.21.2/src/ui.ycp 2011-09-28 19:55:16.000000000 +0200 @@ -8,7 +8,7 @@ * Authors: * Ladislav Slezak <[email protected]> * - * $Id: ui.ycp 63149 2011-01-10 15:36:39Z locilka $ + * $Id: ui.ycp 64586 2011-06-24 11:15:20Z locilka $ * * Yast2 user interface functions - dialogs */ @@ -493,7 +493,7 @@ `HBox( `HSpacing(1), // integer field widget label - `IntField(`id(`old), _("Ma&ximum Number of Old Backups"), 0, 100, current_settings["old"]:3), + `IntField(`id(`old), _("Ma&ximum Number of Old Full Backups"), 0, 100, current_settings["old"]:3), `HStretch() ), `VSpacing(0.45), @@ -932,14 +932,17 @@ continue; } - string dir = substring(Backup::archive_name, 0, findlastof(Backup::archive_name, "/")); - // testing if the directory exists or if it is possible to create it - string error_message = IsPossibleToCreateDirectoryOrExists(dir); - if (error_message != "") { + if (regexpmatch (Backup::archive_name, "/")) { + string dir = substring (Backup::archive_name, 0, findlastof (Backup::archive_name, "/")); + + // testing if the directory exists or if it is possible to create it + string error_message = IsPossibleToCreateDirectoryOrExists (dir); + if (error_message != "") { Popup::Error(error_message); - - cont = false; - continue; + + cont = false; + continue; + } } if (!Backup::multi_volume) continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
