summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-10-14 12:31:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-10-14 12:31:22 +0000
commitb03ec03c04ca4b4ae266d8cfbe2e567969dc8116 (patch)
treea5587318f952c91df2d627bf45125d7aee5af4f8
parent813f6d1687b0951c4fede6584ba6f13f74e906c0 (diff)
downloadurpmi-b03ec03c04ca4b4ae266d8cfbe2e567969dc8116.tar
urpmi-b03ec03c04ca4b4ae266d8cfbe2e567969dc8116.tar.gz
urpmi-b03ec03c04ca4b4ae266d8cfbe2e567969dc8116.tar.bz2
urpmi-b03ec03c04ca4b4ae266d8cfbe2e567969dc8116.tar.xz
urpmi-b03ec03c04ca4b4ae266d8cfbe2e567969dc8116.zip
- urpmi.addmedia:
o handle mirrorlist with parameters: .../foo.list?reason=bar (backported from trunk)
-rw-r--r--NEWS3
-rw-r--r--urpm/mirrors.pm2
2 files changed, 4 insertions, 1 deletions
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] }