summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-10-01 14:08:11 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-10-01 14:08:11 +0000
commit8cefa3749e16a274f6a277a57001e6f09ac1c0a4 (patch)
treeb2ec35af0bb3928843865ce3a6519ac06ee286b3
parent2f31b7e41025b29938a80160a1194ffdd0afb175 (diff)
downloaddrakx-backup-do-not-use-8cefa3749e16a274f6a277a57001e6f09ac1c0a4.tar
drakx-backup-do-not-use-8cefa3749e16a274f6a277a57001e6f09ac1c0a4.tar.gz
drakx-backup-do-not-use-8cefa3749e16a274f6a277a57001e6f09ac1c0a4.tar.bz2
drakx-backup-do-not-use-8cefa3749e16a274f6a277a57001e6f09ac1c0a4.tar.xz
drakx-backup-do-not-use-8cefa3749e16a274f6a277a57001e6f09ac1c0a4.zip
- don't keep noarch pkgs symlinked (to ../../../i586/media/main/xxx.rpm)
when copying packages on disk
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/install/media.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index fe3f98ade..b1fcb6b2a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- don't keep noarch pkgs symlinked (to ../../../i586/media/main/xxx.rpm)
+ when copying packages on disk
+
Version 10.4.223 - 1 October 2007, by Pascal "Pixel" Rigaux
- diskdrake:
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index d889f9141..3a3da5601 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -872,7 +872,7 @@ sub copy_rpms_on_disk {
my $total = install::any::count_files($rpmsdir);
log::l("copying $rpmsdir to $::prefix$dest_dir ($total files)");
eval {
- install::any::cp_with_progress($wait_message, 0, $total, $rpmsdir, "$::prefix$dest_dir");
+ install::any::cp_with_progress_({}, $wait_message, $total, [$rpmsdir], "$::prefix$dest_dir");
};
log::l($@) if $@;