diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-10-04 16:47:14 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-10-04 16:47:14 +0000 |
| commit | 5501afe4c679f16d0599352f618900b8a0388ce9 (patch) | |
| tree | 265af92c19e95c1888ec0a3de4d39749be149017 | |
| parent | 5604997f13654d4ba9b361e7039f81dda73f30b3 (diff) | |
| download | drakx-5501afe4c679f16d0599352f618900b8a0388ce9.tar drakx-5501afe4c679f16d0599352f618900b8a0388ce9.tar.gz drakx-5501afe4c679f16d0599352f618900b8a0388ce9.tar.bz2 drakx-5501afe4c679f16d0599352f618900b8a0388ce9.tar.xz drakx-5501afe4c679f16d0599352f618900b8a0388ce9.zip | |
- fix copying of ../../i586/media/main medium
(for dual_arch CDs sharing the i586 medium)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/media.pm | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 2be66d32c..f9c5bdb8e 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- fix copying of ../../i586/media/main medium + (for dual_arch CDs sharing the i586 medium) - fix configuring kdeglobals (was broken because of /etc/kderc using udpate-alternatives which use absolute symlinks) diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm index 3a3da5601..3814f34a5 100644 --- a/perl-install/install/media.pm +++ b/perl-install/install/media.pm @@ -868,14 +868,19 @@ sub copy_rpms_on_disk { $m->{selected} = 0; } } + my $dest_medium_dir = $dest_dir . '/'. basename($rpmsdir); + #- handle rpmsdir being ../../i586/media/main: we flatten it + -e "$::prefix$dest_medium_dir" and $dest_medium_dir .= '32'; + -e "$::prefix$dest_medium_dir" and next; my $total = install::any::count_files($rpmsdir); - log::l("copying $rpmsdir to $::prefix$dest_dir ($total files)"); + log::l("copying $rpmsdir to $::prefix$dest_medium_dir ($total files)"); eval { - install::any::cp_with_progress_({}, $wait_message, $total, [$rpmsdir], "$::prefix$dest_dir"); + install::any::cp_with_progress_({}, $wait_message, $total, [$rpmsdir], "$::prefix$dest_medium_dir"); }; log::l($@) if $@; + $m->{rpmsdir} = basename($dest_medium_dir); $m->{phys_medium} = $dest_phys_medium; } undef $wait; |