summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2004-07-07 12:18:32 +0000
committerStew Benedict <stewb@mandriva.org>2004-07-07 12:18:32 +0000
commit275863b8ea92b6c03a59eea51b11f133f5d58331 (patch)
treecdbb3db41a86db7e12eb09c1143c188b276ddd2c
parentdc11fc31ff2f7479d6d021c8c613e72ff21bab19 (diff)
downloaddrakx-backup-do-not-use-275863b8ea92b6c03a59eea51b11f133f5d58331.tar
drakx-backup-do-not-use-275863b8ea92b6c03a59eea51b11f133f5d58331.tar.gz
drakx-backup-do-not-use-275863b8ea92b6c03a59eea51b11f133f5d58331.tar.bz2
drakx-backup-do-not-use-275863b8ea92b6c03a59eea51b11f133f5d58331.tar.xz
drakx-backup-do-not-use-275863b8ea92b6c03a59eea51b11f133f5d58331.zip
Merge fixes from Anthill 927, 929.
(filenames with spaces, .backupignore, gui behavior)
-rwxr-xr-xperl-install/standalone/drakbackup23
1 files changed, 16 insertions, 7 deletions
diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup
index 5447c77e8..6b6d458dc 100755
--- a/perl-install/standalone/drakbackup
+++ b/perl-install/standalone/drakbackup
@@ -119,7 +119,7 @@ my @list_of_rpm_to_install;
my @other_files;
my @sys_files = "/etc";
my $host_passwd;
-my $untar_prefix;
+my $untar_prefix = "tar -C $restore_path -x";
# allow not-root user with own config
if ($ENV{USER} ne 'root' && $ENV{HOME} ne '/root') {
@@ -1039,8 +1039,8 @@ sub build_backup_files() {
}
if (!$first_done) {
my $list_file = name_list_file($incr . $user);
- do_find(undef, $find_args_cuser, $list_file, $path_name);
- do_tar($tar_cmd_user, "backup_$incr$user", undef, $path_name);
+ do_find(undef, $find_args_user, $list_file, $path_name);
+ do_tar($tar_cmd_cuser, "backup_$incr$user", undef, $path_name);
}
push_list("list_$incr$user") if $incr =~ /_user/;
files_to_results("$incr$user");
@@ -2878,6 +2878,7 @@ sub restore_do() {
}
sub restore_do2() {
+ destroy_widget();
my $do_restore;
my $text = new Gtk2::TextView;
restore_state();
@@ -3182,7 +3183,8 @@ sub find_files_to_restore() {
my @files_to_restore;
my $cat_entry;
my @catalog = cat_("$cfg_dir/drakbackup_catalog");
-
+ destroy_widget();
+
#- file info in tree view
my $model = Gtk2::TreeStore->new("Glib::String", "Gtk2::Gdk::Pixbuf", "Glib::Int");
my $file_list = Gtk2::TreeView->new_with_model($model);
@@ -3690,9 +3692,12 @@ sub wildcard_to_tarfile {
sub file_to_tarfile {
my ($restore_file, $wildcard) = @_;
+ #- remove leading "/"
+ $restore_file = substr($restore_file, 1);
+ #- filename with spaces
+ $restore_file = "'" . $restore_file . "'" if $restore_file =~ / /;
my $tarfile = `grep -l $restore_file $conf{PATH_TO_SAVE}/*$wildcard.txt`;
chop $tarfile;
- $restore_file = substr($restore_file, 1);
$tarfile = basename($tarfile);
$tarfile =~ s/txt/$conf{OPTION_COMP}/;
$tarfile =~ s/list/backup/;
@@ -3871,6 +3876,10 @@ sub cbutton() {
0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => \&interactive_mode_box);
}
+sub cbuttonr() {
+ 0, gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => \&restore_box);
+}
+
sub ibutton {
my ($msg) = @_;
0, gtksignal_connect(Gtk2::Button->new($msg), clicked => \&interactive_mode_box);
@@ -3980,7 +3989,7 @@ sub button_box_restore_end() {
$button_box_tmp->destroy;
gtkpack($button_box,
$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
- cbutton(),
+ cbuttonr(),
hbutton(),
hspace(),
pbutton(),
@@ -4007,7 +4016,7 @@ sub button_box_restore() {
$button_box_tmp->destroy;
gtkpack($button_box,
$button_box_tmp = gtkpack_(new Gtk2::HButtonBox,
- cbutton(),
+ cbuttonr(),
hbutton(),
hspace(),
pbutton(),