summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-06-15 03:47:43 -0400
committerThomas Backlund <tmb@mageia.org>2015-06-15 22:54:32 +0300
commitb3967b0ac3b0a56dc537744575fbe193a05e7903 (patch)
tree6ee54cc672381363c92c6f01fbb996634c214e99 /perl-install
parentdd71c39065f08aeb0868d153da1f564541ca668c (diff)
downloaddrakx-b3967b0ac3b0a56dc537744575fbe193a05e7903.tar
drakx-b3967b0ac3b0a56dc537744575fbe193a05e7903.tar.gz
drakx-b3967b0ac3b0a56dc537744575fbe193a05e7903.tar.bz2
drakx-b3967b0ac3b0a56dc537744575fbe193a05e7903.tar.xz
drakx-b3967b0ac3b0a56dc537744575fbe193a05e7903.zip
really fix urpmi media when installing from USB
thus fixing mga#5690 there was a typo in commit d269fc99ca5de9df10c673c00c5d28063340b848
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/media.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index bd255b47d..40e422044 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- really fix urpmi media when installing from USB (mga#5690)
+
Version 16.104 - 13 June 2015
- diskdrake:
diff --git a/perl-install/install/media.pm b/perl-install/install/media.pm
index d6d30219d..11a92691b 100644
--- a/perl-install/install/media.pm
+++ b/perl-install/install/media.pm
@@ -533,7 +533,7 @@ sub adjust_paths_in_urpmi_cfg {
} elsif (member($phys_m->{method}, qw(disk nfs))) {
# use the real mount point:
if ($medium->{url} =~ m!/tmp/image(/media)?!) {
- $medium->{url} =~ s!/tmp/image(/media).!$phys_m->{mntpoint}$phys_m->{rel_path}!;
+ $medium->{url} =~ s!/tmp/image(/media)?!$phys_m->{mntpoint}$phys_m->{rel_path}!;
} else {
# just remove $::prefix and we already have the real mount point:
$medium->{url} =~ s!^$::prefix!!;