- urpmi, urpmi.addmedia, urpmi.update:

  o handle variables $ARCH/$RELEASE in mirrorlist

2 files changed, 8 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 53644dd6..d0fd53d1 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@
 - urpmi, urpmi.addmedia, urpmi.update:
   o have fatal errors on some errors that must not happen (eg: moving rpm from
     download dir to cachedir)
+  o handle variables $ARCH/$RELEASE in mirrorlist
 - urpmi:
   o do not say "files are missing" when the downloaded rpm is corrupted
 
diff --git a/urpm/mirrors.pm b/urpm/mirrors.pm
index 17366b38..70fa5d13 100644
--- a/urpm/mirrors.pm
+++ b/urpm/mirrors.pm
@@ -111,8 +111,13 @@ sub _save_cache {
 sub _list {
     my ($urpm, $mirrorlist) = @_;
 
-    # expand the variable
-    $mirrorlist = _MIRRORLIST() if $mirrorlist eq '$MIRRORLIST';
+    # expand the variables
+    if ($mirrorlist eq '$MIRRORLIST') {
+	$mirrorlist = _MIRRORLIST();
+    } else {
+	require urpm::cfg;
+	$mirrorlist = urpm::cfg::expand_line($mirrorlist);
+    }
 
     my @mirrors = _mirrors_filtered($urpm, $mirrorlist);
     add_proximity_and_sort($urpm, \@mirrors);