From b3967b0ac3b0a56dc537744575fbe193a05e7903 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 15 Jun 2015 03:47:43 -0400
Subject: really fix urpmi media when installing from USB

thus fixing mga#5690
there was a typo in commit d269fc99ca5de9df10c673c00c5d28063340b848
---
 perl-install/install/NEWS     | 2 ++
 perl-install/install/media.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install')

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!!;
-- 
cgit v1.2.1