From b03ec03c04ca4b4ae266d8cfbe2e567969dc8116 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 14 Oct 2008 12:31:22 +0000
Subject: - urpmi.addmedia:   o handle mirrorlist with parameters:
 .../foo.list?reason=bar

(backported from trunk)
---
 NEWS            | 3 +++
 urpm/mirrors.pm | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 04820ab9..75c82fe0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- urpmi.addmedia:
+  o handle mirrorlist with parameters: .../foo.list?reason=bar
+
 Version 5.19.5 - 6 October 2008, by Pascal "Pixel" Rigaux
 
 - gurpmi:
diff --git a/urpm/mirrors.pm b/urpm/mirrors.pm
index cfcc932b..1974161e 100644
--- a/urpm/mirrors.pm
+++ b/urpm/mirrors.pm
@@ -254,7 +254,7 @@ sub _mandriva_mirrorlist {
 #- heuristic to detect wether it is really a mirrorlist or a simple mirror url:
 sub _is_only_one_mirror {
     my ($mirrorlist) = @_;
-    _expand($mirrorlist) !~ /\.list$/;
+    _expand($mirrorlist) !~ /\.list(\?|$)/;
 }
 
 sub _network_mtime() { (stat('/etc/resolv.conf'))[9] }
-- 
cgit v1.2.1