summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@mandriva.com>2009-08-11 09:29:55 +0000
committerChristophe Fergeau <cfergeau@mandriva.com>2009-08-11 09:29:55 +0000
commitd15dc371d6c3077a94afea361dfaf8c9450644f2 (patch)
tree07cbe0c67cca0032c80cbda558621cbe4564456e
parentb107eb2b4fb87e2a462c0043919b2d0f310bdde8 (diff)
downloadurpmi-d15dc371d6c3077a94afea361dfaf8c9450644f2.tar
urpmi-d15dc371d6c3077a94afea361dfaf8c9450644f2.tar.gz
urpmi-d15dc371d6c3077a94afea361dfaf8c9450644f2.tar.bz2
urpmi-d15dc371d6c3077a94afea361dfaf8c9450644f2.tar.xz
urpmi-d15dc371d6c3077a94afea361dfaf8c9450644f2.zip
take into account $RELEASE, $ARCH in urls passed to urpmi.addmedia
Fixes bug #52276
-rw-r--r--urpm/media.pm3
1 files changed, 3 insertions, 0 deletions
diff --git a/urpm/media.pm b/urpm/media.pm
index 92e46c9e..ca37f0fc 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -1668,7 +1668,10 @@ sub update_those_media {
#- don't ever update static media
$medium->{static} and next;
+ my $unsubstituted_url = $medium->{url};
+ $medium->{url} = urpm::cfg::expand_line($medium->{url});
my $rc = _update_medium($urpm, $medium, %options);
+ $medium->{url} = $unsubstituted_url;
$rc or return if !$options{allow_failures};
$updates_result{$rc || 'error'}++;
}