Hello community,
here is the log from the commit of package yast2-backup
checked in at Wed Sep 24 17:46:40 CEST 2008.
--------
--- yast2-backup/yast2-backup.changes 2008-05-19 09:43:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-backup/yast2-backup.changes 2008-09-22 14:31:54.000000000 +0200
@@ -1,0 +2,29 @@
+Mon Sep 8 17:51:38 CEST 2008 - locilka@suse.cz
+
+- Merged texts from proofread.
+- Adapted testsuite.
+- 2.17.0
+
+-------------------------------------------------------------------
+Fri Jun 13 13:27:06 CEST 2008 - locilka@suse.cz
+
+- YCP module 'Backup' has been marked as Internal.
+- [Cancel] / [OK] (bnc #398501).
+
+-------------------------------------------------------------------
+Tue Jun 3 18:38:51 CEST 2008 - locilka@suse.cz
+
+- New option 'Back Up Content of All Packages' has been added to
+ backup not only changed files but all (bnc #344643).
+
+-------------------------------------------------------------------
+Mon Jun 2 18:07:34 CEST 2008 - locilka@suse.cz
+
+- TextEntry items replaced with InputField items.
+- Checking existence of directory included for backup (bnc #395835)
+- Added Browse button for selecting the filename to store the
+ backup to.
+- Added confirmation dialog before removing dierctory included for
+ backup.
+
+-------------------------------------------------------------------
Old:
----
yast2-backup-2.16.5.tar.bz2
New:
----
yast2-backup-2.17.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-backup.spec ++++++
--- /var/tmp/diff_new_pack.Uy1525/_old 2008-09-24 17:46:32.000000000 +0200
+++ /var/tmp/diff_new_pack.Uy1525/_new 2008-09-24 17:46:32.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package yast2-backup (Version 2.16.5)
+# spec file for package yast2-backup (Version 2.17.0)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,12 +19,12 @@
Name: yast2-backup
-Version: 2.16.5
+Version: 2.17.0
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-backup-2.16.5.tar.bz2
+Source0: yast2-backup-2.17.0.tar.bz2
Prefix: /usr
Summary: YaST2 - System Backup
BuildArch: noarch
@@ -63,7 +70,7 @@
Lukas Ocilka
%prep
-%setup -n yast2-backup-2.16.5
+%setup -n yast2-backup-2.17.0
%build
%{prefix}/bin/y2tool y2autoconf
@@ -102,6 +109,23 @@
%{prefix}/share/applications/YaST2/backup.desktop
%doc %{prefix}/share/doc/packages/yast2-backup
%changelog
+* Mon Sep 08 2008 locilka@suse.cz
+- Merged texts from proofread.
+- Adapted testsuite.
+- 2.17.0
+* Fri Jun 13 2008 locilka@suse.cz
+- YCP module 'Backup' has been marked as Internal.
+- [Cancel] / [OK] (bnc #398501).
+* Tue Jun 03 2008 locilka@suse.cz
+- New option 'Back Up Content of All Packages' has been added to
+ backup not only changed files but all (bnc #344643).
+* Mon Jun 02 2008 locilka@suse.cz
+- TextEntry items replaced with InputField items.
+- Checking existence of directory included for backup (bnc #395835)
+- Added Browse button for selecting the filename to store the
+ backup to.
+- Added confirmation dialog before removing dierctory included for
+ backup.
* Mon May 19 2008 locilka@suse.cz
- Replacing Wizard::SetFocusToNextButton with UI::SetFocus which
makes sure the button is really focused (bnc #389126).
++++++ yast2-backup-2.16.5.tar.bz2 -> yast2-backup-2.17.0.tar.bz2 ++++++
++++ 2264 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.16.5/configure.in new/yast2-backup-2.17.0/configure.in
--- old/yast2-backup-2.16.5/configure.in 2008-05-19 16:05:26.000000000 +0200
+++ new/yast2-backup-2.17.0/configure.in 2008-09-22 14:37:27.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-backup
dnl
-dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-backup, 2.16.5, http://bugs.opensuse.org/, yast2-backup)
+AC_INIT(yast2-backup, 2.17.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.16.5"
+VERSION="2.17.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.16.5/src/backup.ycp new/yast2-backup-2.17.0/src/backup.ycp
--- old/yast2-backup-2.16.5/src/backup.ycp 2008-03-05 13:09:31.000000000 +0100
+++ new/yast2-backup-2.17.0/src/backup.ycp 2008-06-03 18:43:31.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Ladislav Slezak
*
- * $Id: backup.ycp 45208 2008-03-05 12:09:30Z locilka $
+ * $Id: backup.ycp 48034 2008-06-03 16:43:30Z locilka $
*
* Main file for backup module - definition of workflow
*
@@ -153,7 +153,7 @@
// create wizard dialog
Wizard::CreateDialog();
// set icon
- Wizard::SetTitleIcon("backup");
+ Wizard::SetTitleIcon("yast-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.16.5/src/Backup.ycp new/yast2-backup-2.17.0/src/Backup.ycp
--- old/yast2-backup-2.16.5/src/Backup.ycp 2008-04-07 10:52:21.000000000 +0200
+++ new/yast2-backup-2.17.0/src/Backup.ycp 2008-06-13 13:27:44.000000000 +0200
@@ -8,7 +8,9 @@
* Authors:
* Ladislav Slezak
*
- * $Id: Backup.ycp 46166 2008-04-07 08:52:21Z locilka $
+ * Internal
+ *
+ * $Id: Backup.ycp 48288 2008-06-13 11:27:44Z locilka $
*
* Main file for backup module
*
@@ -115,6 +117,7 @@
global symbol default_user_volume_unit = nil;
global boolean default_search = true; // search files which do not belong to any package
+global boolean default_all_rpms_content = false; // by default only changed RPM-files are backed up
global boolean default_system = false; // backup system areas
global boolean default_display = false; // display files before creating archive
global boolean default_do_md5_test = true;
@@ -177,9 +180,10 @@
global string temporary_dir = default_temporary_dir;
global boolean mail_summary = default_mail_summary;
-global boolean do_search = default_search; // search files which do not belong to any package
-global boolean system = default_system; // backup system areas
-global boolean display = default_display; // display files before creating archive
+global boolean do_search = default_search; // search files which do not belong to any package
+global boolean backup_all_rpms_content = default_all_rpms_content; // backup content of all packages
+global boolean system = default_system; // backup system areas
+global boolean display = default_display; // display files before creating archive
global boolean do_md5_test = default_do_md5_test;
global boolean perms = default_perms;
@@ -371,6 +375,12 @@
global define string get_search_script_parameters() ``{
string script_options = " --start-dir / --output-progress"; // required parameter for YaST2 frontend
+ if (backup_all_rpms_content) {
+ // see bnc #344643
+ y2milestone ("Backup all RPMs content...");
+ script_options = script_options + " --all-rpms-content";
+ }
+
if (do_search)
{
script_options = script_options + " --search";
@@ -1198,6 +1208,7 @@
`user_volume_size : user_volume_size,
`user_volume_unit : user_volume_unit,
`search : do_search,
+ `all_rpms_content : backup_all_rpms_content,
`system : system,
`display : display,
`do_md5_test : do_md5_test,
@@ -1260,6 +1271,7 @@
user_volume_size = profile[ `user_volume_size ]: default_user_volume_size;
user_volume_unit = profile[ `user_volume_unit ]: default_user_volume_unit;
do_search = profile[ `search ]: default_search;
+ backup_all_rpms_content = profile[ `all_rpms_content ]: default_all_rpms_content;
system = profile[ `system ]: default_system;
display = profile[ `display ]: default_display;
do_md5_test = profile[ `do_md5_test ]: default_do_md5_test;
@@ -1350,6 +1362,7 @@
user_volume_size = default_user_volume_size;
user_volume_unit = default_user_volume_unit;
do_search = default_search;
+ backup_all_rpms_content = default_all_rpms_content;
system = default_system;
display = default_display;
do_md5_test = default_do_md5_test;
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.16.5/src/functions.ycp new/yast2-backup-2.17.0/src/functions.ycp
--- old/yast2-backup-2.16.5/src/functions.ycp 2008-03-05 13:09:31.000000000 +0100
+++ new/yast2-backup-2.17.0/src/functions.ycp 2008-06-02 18:20:09.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Ladislav Slezak
*
- * $Id: functions.ycp 45208 2008-03-05 12:09:30Z locilka $
+ * $Id: functions.ycp 47997 2008-06-02 16:20:08Z locilka $
*
* Functions used by backup module.
*/
@@ -104,7 +104,7 @@
((size(combo_content) > 0) ?
`ComboBox(`id(`te), `opt(`hstretch, `editable), label, combo_content)
:
- `TextEntry(`id(`te), label, value)
+ `InputField (`id (`te), `opt (`hstretch), label, value)
),
`VSpacing(1.0),
`HBox(
@@ -137,7 +137,7 @@
UI::OpenDialog(
`VBox(
`HBox (
- `TextEntry(`id(`te), label, value),
+ `InputField (`id (`te), `opt (`hstretch), label, value),
`HSpacing(1.0),
`VBox (
`VSpacing(0.9),
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.16.5/src/help_texts.ycp new/yast2-backup-2.17.0/src/help_texts.ycp
--- old/yast2-backup-2.16.5/src/help_texts.ycp 2008-04-01 10:34:50.000000000 +0200
+++ new/yast2-backup-2.17.0/src/help_texts.ycp 2008-09-22 14:23:48.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Ladislav Slezak
*
- * $Id: help_texts.ycp 45907 2008-04-01 06:53:17Z jsrain $
+ * $Id: help_texts.ycp 51356 2008-09-22 12:24:05Z locilka $
*
* Help texts used in workflow dialogs
*
@@ -74,20 +74,26 @@
*/
define string backup_help_backup_setting() ``{
- // For translators: help text in backup settings dialog - part 1/4
+ // For translators: help text in backup settings dialog - part 1
return _("<P><B><BIG>Backup Options</BIG></B><BR>Here, select which parts of the system to search and back up. <B>Archive Description</B> is an optional description of the backup archive.</P>")
- // For translators: help text in backup settings dialog - part 2/4
+ // For translators: help text in backup settings dialog - part 2
+ _("<P>The archive will contain files from packages that were changed since
package installation or upgrade. Files that do not belong to any
package can be optionally added to the archive.</P>")
- // For translators: help text in backup settings dialog - part 3/4
+ // For translators: help text in backup settings dialog - part 3
+ _("<P>Check <B>Display List of Files</B> to show and edit a list of files found before creating the backup archive.</P>")
- // For translators: help text in backup settings dialog - part 4/4
- + _("<P>If you select <b>Check MD5 Sum</b>, the MD5 sum is used to determine if the file was changed. It is more reliable than checking the size or modification time, but takes longer.</P>");
+ // For translators: help text in backup settings dialog - part 4
+ + _("<P>If you select <b>Check MD5 Sum</b>, the MD5 sum is used to determine if the file was changed. It is more reliable than checking the size or modification time, but takes longer.</P>")
+ // TRANSLATORS: help text in backup settings dialog - part 5
+ + _("<p>Select <b>Backup Content of All Packages</b> to back up all files belonging
+to all installed packages. This option is useful when creating an archive that
+need not have the same installation repositories or the same packages
+available in order to restore. It is faster not to use this option.</p>
+");
}
@@ -259,20 +265,21 @@
return
// For translators: help text in exclude directory dialog - part 1/5
- _("<p><big><b>Included Directories</b></big><br>
+ _("<p><b>Included Directories</b><br>
It is possible to limit the search to back up only selected directories.
To add a new directory, click <b>Add</b> and select a directory.
To change or delete a directory, select it and click
<b>Edit</b> or <b>Delete</b>.
-If you do not select any directory or if you delete all already listed ones,
-the entire file system is searched and backed up.</p>")
+If you do not select any directory or if you delete all the already listed ones,
+the entire file system is searched and backed up.</p>
+")
// For translators: help text in exclude directory dialog - part 2/5
+ _("<P><BIG><B>Constraints</B></BIG>
<BR>It is possible to exclude some files from the backup.
Search constraints can be a directory, file system, or regular expression.
-Use <b>Edit</b> to modify an existing constraint.
-<b>Delete</b> removes the selected constraint.
+Use <b>Edit</b> to modify an existing constraint, or
+<b>Delete</b> to remove the selected constraint.
To add a new constraint, click <b>Add</b> then select the type of constraint. </P>")
// For translators: help text in exclude directory dialog - part 3/5
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.16.5/src/scripts/backup_search.pl new/yast2-backup-2.17.0/src/scripts/backup_search.pl
--- old/yast2-backup-2.16.5/src/scripts/backup_search.pl 2007-10-30 09:53:20.000000000 +0100
+++ new/yast2-backup-2.17.0/src/scripts/backup_search.pl 2008-06-03 18:41:27.000000000 +0200
@@ -16,7 +16,7 @@
# package. Output is list of files and optional more
# information about progress of search.
#
-# $Id: backup_search.pl 41630 2007-10-30 08:53:19Z locilka $
+# $Id: backup_search.pl 48033 2008-06-03 16:41:26Z locilka $
#
use Getopt::Long;
@@ -47,6 +47,7 @@
my $output_default = 0;
my $no_md5 = 0;
my $pkg_verification = 0;
+my $backup_all_rpms_content = 0;
my $inst_src_packages = "";
my %instalable_packages;
@@ -67,7 +68,7 @@
'start-dir=s' => \$start_directory, 'same-fs' => \$same_fs,
'pkg-verification' => \$pkg_verification,
'no-md5' => \$no_md5, 'inst-src-packages=s'=> \$inst_src_packages,
- 'include-dir=s' => \@include_d,
+ 'include-dir=s' => \@include_d, 'all-rpms-content' => \$backup_all_rpms_content,
);
if ($help)
@@ -78,13 +79,14 @@
print "Options:\n\n";
- print " --no-md5 Do not use MD5 test in verification\n";
+ print " --no-md5 Do not use MD5 test in verification\n";
+ print " --all-rpms-content All RPMs will be backed up completely\n";
print " --search Search files which do not belog to any package\n";
print " --exclude-dir <dir> Exclude directory <dir> from search\n";
print " --exclude-fs <fs> Exclude filesystem <fs> from search\n";
print " --exclude-files <r> Exclude files matching regular expression <r>\n";
-
+
print " --include-dir <dir> Only directories listed are backed up\n";
print " --output-files Display only names of files to backup\n";
@@ -212,6 +214,14 @@
}
}
+# bnc #344643
+# backup all installed packages
+if ($backup_all_rpms_content) {
+ foreach my $pk (@installed_packages) {
+ $unavailable_pkgs{$pk} = 1;
+ }
+}
+
undef %instalable_packages;
undef %installed_packages_hash;
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.16.5/src/ui.ycp new/yast2-backup-2.17.0/src/ui.ycp
--- old/yast2-backup-2.16.5/src/ui.ycp 2008-05-19 09:43:27.000000000 +0200
+++ new/yast2-backup-2.17.0/src/ui.ycp 2008-06-13 16:25:31.000000000 +0200
@@ -8,7 +8,7 @@
* Authors:
* Ladislav Slezak
*
- * $Id: ui.ycp 47653 2008-05-19 07:43:26Z locilka $
+ * $Id: ui.ycp 48303 2008-06-13 14:25:31Z locilka $
*
* Yast2 user interface functions - dialogs
*/
@@ -27,6 +27,8 @@
import "Nfs";
import "PackageSystem";
import "Popup";
+import "Confirm";
+import "Mode";
include "backup/help_texts.ycp";
include "backup/functions.ycp";
@@ -713,7 +715,14 @@
Wizard::SetContents(_("Archive Settings"),
`VBox(
`VSpacing(0.5),
- `TextEntry(`id(`filename), Label::FileName()),
+ `HBox (
+ `InputField (`id (`filename), `opt (`hstretch), Label::FileName()),
+ `HSpacing(1),
+ `VBox (
+ `Label (""),
+ `PushButton (`id(`browse_file), Label::BrowseButton())
+ )
+ ),
`VSpacing(0.5),
`Frame(_("Backup Location"),
@@ -729,7 +738,7 @@
`HBox(
`HSpacing(2),
// text entry label
- `TextEntry(`id(`nfsserver), _("I&P Address or Name of NFS Server"), Backup::nfsserver),
+ `InputField (`id (`nfsserver), `opt (`hstretch), _("I&P Address or Name of NFS Server"), Backup::nfsserver),
`HSpacing(1),
// push button label
`VBox(
@@ -741,7 +750,7 @@
`HBox(
`HSpacing(2),
// text entry label
- `TextEntry(`id(`nfsexport), _("&Remote Directory"), Backup::nfsexport),
+ `InputField (`id (`nfsexport), `opt (`hstretch), _("&Remote Directory"), Backup::nfsexport),
`HSpacing(1),
// push button label
`VBox(
@@ -841,10 +850,20 @@
while (!cont)
{
+ ret = (symbol) UI::UserInput();
+
+ if (ret == `browse_file) {
+ // TRANSLATORS: explanatory headline for UI::AskForExistingFile pop-up
+ string new_filename = UI::AskForExistingFile("", "", _("Where would you like to store the backup?"));
+ if (new_filename != nil && new_filename != "") {
+ UI::ChangeWidget (`id(`filename), `Value, new_filename);
+ }
+ continue;
+ }
+
// update dialog (enable/disable widgets)
update_location_dialog();
- ret = (symbol)UI::UserInput();
Backup::nfsserver = (string)UI::QueryWidget(`id(`nfsserver), `Value);
Backup::nfsexport = (string)UI::QueryWidget(`id(`nfsexport), `Value);
@@ -1100,7 +1119,7 @@
`Left(
`HBox(
// text entry label
- `TextEntry(`id(`user_size), _("Custom &Size")),
+ `InputField (`id (`user_size), `opt (`hstretch), _("Custom &Size")),
`ComboBox(`id(`user_unit), "", description_combo_units),
`HStretch()
)
@@ -1217,6 +1236,8 @@
`VSpacing(0.3),
// check box label
`Left(`CheckBox(`id(`search), `opt(`notify), _("&Back Up Files Not Belonging to Any Package"), Backup::do_search)),
+ // check box label
+ `Left(`CheckBox(`id(`all_rpms_content), `opt(`notify), _("Back Up Content of &All Packages"), Backup::backup_all_rpms_content)),
`VSpacing(0.3),
// check box label
`Left(`CheckBox(`id(`display), _("Display List of Files Before &Creating Archive"), Backup::display)),
@@ -1265,6 +1286,7 @@
}
// get values
+ Backup::backup_all_rpms_content = (boolean) UI::QueryWidget(`id(`all_rpms_content), `Value);
Backup::do_search = (boolean)UI::QueryWidget(`id(`search), `Value);
Backup::display = (boolean)UI::QueryWidget(`id(`display), `Value);
Backup::do_md5_test = (boolean)UI::QueryWidget(`id(`md5_check), `Value);
@@ -3242,7 +3264,7 @@
),
`VSpacing(1.0),
// text entry label
- `TextEntry(`id(`tmp), `opt(`hstretch), _("&Temporary Location of Archive Parts"), Backup::tmp_dir),
+ `InputField (`id (`tmp), `opt(`hstretch), _("&Temporary Location of Archive Parts"), Backup::tmp_dir),
`VSpacing(0.5)
),
expert_options_help(), true, true
@@ -3326,7 +3348,8 @@
*/
define symbol SelectProfileDialog() ``{
- Wizard::SetNextButton(`finish, Label::CloseButton() );
+ Wizard::SetNextButton(`finish, Label::OKButton() );
+ Wizard::SetAbortButton (`abort, Label::CancelButton());
Wizard::HideBackButton();
string tableheader1 = _("Name");
@@ -3520,7 +3543,7 @@
`VSpacing(0.5),
`HBox(
`HSpacing(1.0),
- `TextEntry(`id(`dir), label, dir),
+ `InputField (`id(`dir), `opt (`vstretch), label, dir),
`HSpacing(1),
`VBox(
`Label(""),
@@ -3799,7 +3822,7 @@
`VSquash(
`MinHeight(6,
// selection box
- `SelectionBox(`id(`include), `opt(`shrinkable), _("Directories Included in Search"), [])
+ `SelectionBox(`id(`include), `opt(`shrinkable), _("&Directories Included in Search"), [])
)
),
`HBox(
@@ -3975,7 +3998,7 @@
if (regexpmatch(new_dir, "^.+/$")) {
new_dir = regexpsub(new_dir, "^(.+)/$", "\\1");
}
-
+
if (new_dir == Backup::default_include_dir) {
y2milestone("Selecting the whole fs '/'");
Backup::include_dirs = [Backup::default_include_dir];
@@ -3986,18 +4009,35 @@
}
void AddIncludeItem () {
- // return $[ "text" : text, "clicked" : input ];
- map new_dir = ShowEditBrowseDialog(_("&Add New Directory"), "");
+ while (true) {
+ // return $[ "text" : text, "clicked" : input ];
+ map new_dir = ShowEditBrowseDialog(_("&Add New Directory"), "");
+
+ if (new_dir["clicked"]:nil == `ok && new_dir["text"]:"" != "" && new_dir["text"]:nil != nil) {
+ // bnc #395835
+ if (Mode::normal() && ! FileUtils::Exists (new_dir["text"]:"") && (! Popup::AnyQuestion (
+ _("Warning"),
+ sformat (_("Directory %1 does not exist.
+
+Use it anyway?"), new_dir["text"]:""),
+ _("Yes, Use It"),
+ Label::NoButton(),
+ `focus_yes
+ ))) {
+ continue;
+ }
- if (new_dir["clicked"]:nil == `ok && new_dir["text"]:"" != "" && new_dir["text"]:nil != nil) {
- AddIncludeItemNow(new_dir["text"]:"");
+ AddIncludeItemNow(new_dir["text"]:"");
- RedrawIncludeTable();
+ RedrawIncludeTable();
+ }
+
+ break;
}
}
void DeleteIncludeItem (string delete_dir) {
- if (contains(Backup::include_dirs, delete_dir)) {
+ if (Confirm::DeleteSelected() && contains(Backup::include_dirs, delete_dir)) {
Backup::include_dirs = filter (string one_dir, Backup::include_dirs, {
return one_dir != delete_dir;
});
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.16.5/testsuite/tests/RestoreBackupProfile.out new/yast2-backup-2.17.0/testsuite/tests/RestoreBackupProfile.out
--- old/yast2-backup-2.16.5/testsuite/tests/RestoreBackupProfile.out 2007-05-18 10:43:37.000000000 +0200
+++ new/yast2-backup-2.17.0/testsuite/tests/RestoreBackupProfile.out 2008-09-22 14:24:26.000000000 +0200
@@ -3,4 +3,4 @@
Return true
Return true
Return nil
-Dump $["final":$[`archive_name:"/tmp/ahoj.tar", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `default_dir:["/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache"], `description:"", `detected_ext2:nil, `detected_fs:["devpts", "nfs", "proc", "reiserfs", "rootfs", "shm"], `dir_list:["/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/usr", "/home", "/local", "/etc", "/var", "/opt"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["bdev", "devpts", "futexfs", "iso9660", "nfs", "pipefs", "proc", "ramfs", "rootfs", "shm", "sockfs", "tmpfs", "usbfs"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:nil, `user_volume_size:"", `user_volume_unit:`B, `volume_size:`fd144]]
+Dump $["final":$[`all_rpms_content:false, `archive_name:"/tmp/ahoj.tar", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `default_dir:["/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache"], `description:"", `detected_ext2:nil, `detected_fs:["devpts", "nfs", "proc", "reiserfs", "rootfs", "shm"], `dir_list:["/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/usr", "/home", "/local", "/etc", "/var", "/opt"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["bdev", "devpts", "futexfs", "iso9660", "nfs", "pipefs", "proc", "ramfs", "rootfs", "shm", "sockfs", "tmpfs", "usbfs"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:nil, `user_volume_size:"", `user_volume_unit:`B, `volume_size:`fd144]]
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.16.5/testsuite/tests/RestoreBackupSettings.out new/yast2-backup-2.17.0/testsuite/tests/RestoreBackupSettings.out
--- old/yast2-backup-2.16.5/testsuite/tests/RestoreBackupSettings.out 2008-04-07 10:52:57.000000000 +0200
+++ new/yast2-backup-2.17.0/testsuite/tests/RestoreBackupSettings.out 2008-09-22 14:32:46.000000000 +0200
@@ -1,2 +1,2 @@
Dump $[]
-Dump $["test profile":$[`archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144]]
+Dump $["test profile":$[`all_rpms_content:false, `archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144]]
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.16.5/testsuite/tests/WriteBackupProfiles.out new/yast2-backup-2.17.0/testsuite/tests/WriteBackupProfiles.out
--- old/yast2-backup-2.16.5/testsuite/tests/WriteBackupProfiles.out 2008-04-07 10:54:30.000000000 +0200
+++ new/yast2-backup-2.17.0/testsuite/tests/WriteBackupProfiles.out 2008-09-22 14:36:57.000000000 +0200
@@ -1,2 +1,2 @@
Dump $[]
-Dump $["default profile":$[`archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144], "empty profile":$[`archive_name:"Does not work", `archive_type:nil, `autoprofile:true, `backup_all_ext2:nil, `backup_none_ext2:nil, `backup_pt:nil, `backup_selected_ext2:nil, `default_dir:nil, `description:"Does not work - profile", `detected_ext2:nil, `detected_fs:nil, `dir_list:nil, `display:nil, `do_md5_test:nil, `ext2_backup:nil, `fs_exclude:nil, `include_dirs:["/"], `mail_summary:true, `multi_volume:nil, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:nil, `system:nil, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:nil, `user_volume_size:nil, `user_volume_unit:nil, `volume_size:nil]]
+Dump $["default profile":$[`all_rpms_content:false, `archive_name:"", `archive_type:`tgz, `autoprofile:true, `backup_all_ext2:false, `backup_none_ext2:true, `backup_pt:true, `backup_selected_ext2:false, `default_dir:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `description:"", `detected_ext2:nil, `detected_fs:nil, `dir_list:["/media", "/tmp", "/var/lock", "/var/run", "/var/tmp", "/var/cache", "/sys", "/windows", "/mnt"], `display:false, `do_md5_test:true, `ext2_backup:[], `fs_exclude:["iso9660", "ntfs"], `include_dirs:["/"], `mail_summary:true, `multi_volume:false, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:true, `system:false, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:[], `user_volume_size:"", `user_volume_unit:nil, `volume_size:`fd144], "empty profile":$[`all_rpms_content:false, `archive_name:"Does not work", `archive_type:nil, `autoprofile:true, `backup_all_ext2:nil, `backup_none_ext2:nil, `backup_pt:nil, `backup_selected_ext2:nil, `default_dir:nil, `description:"Does not work - profile", `detected_ext2:nil, `detected_fs:nil, `dir_list:nil, `display:nil, `do_md5_test:nil, `ext2_backup:nil, `fs_exclude:nil, `include_dirs:["/"], `mail_summary:true, `multi_volume:nil, `nfsexport:"", `nfsserver:"", `perms:true, `regexp_list:[], `search:nil, `system:nil, `target_type:`file, `tmp_dir:"/tmp", `unselected_files:nil, `user_volume_size:nil, `user_volume_unit:nil, `volume_size: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.16.5/VERSION new/yast2-backup-2.17.0/VERSION
--- old/yast2-backup-2.16.5/VERSION 2008-05-19 09:42:41.000000000 +0200
+++ new/yast2-backup-2.17.0/VERSION 2008-09-22 14:23:32.000000000 +0200
@@ -1 +1 @@
-2.16.5
+2.17.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org