diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-10-14 18:10:35 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-10-14 18:10:35 +0000 |
| commit | bcdeb851616afd2dfe3d4b33f866b1b1722c0cac (patch) | |
| tree | 1f8ca64c0caa6db89a05590b8ba94bdf724e7e92 | |
| parent | cf870d5faab4a2e23fb21524c0e59d3a41587d3f (diff) | |
| download | urpmi-bcdeb851616afd2dfe3d4b33f866b1b1722c0cac.tar urpmi-bcdeb851616afd2dfe3d4b33f866b1b1722c0cac.tar.gz urpmi-bcdeb851616afd2dfe3d4b33f866b1b1722c0cac.tar.bz2 urpmi-bcdeb851616afd2dfe3d4b33f866b1b1722c0cac.tar.xz urpmi-bcdeb851616afd2dfe3d4b33f866b1b1722c0cac.zip | |
- library:
o allow mdkapplet-upgrade-helper to force $MIRRORLIST distro version
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | urpm/mirrors.pm | 6 |
2 files changed, 7 insertions, 1 deletions
@@ -3,6 +3,8 @@ it allows "mv /etc/urpmi/urpmi.cfg.{backup,} ; urpmi.update -a --nocheck" - aria2 o use it even if nearest mirror is rsync +- library: + o allow mdkapplet-upgrade-helper to force $MIRRORLIST distro version Version 6.14.3 - 13 October 2008 diff --git a/urpm/mirrors.pm b/urpm/mirrors.pm index 37a06b40..0ea9b58f 100644 --- a/urpm/mirrors.pm +++ b/urpm/mirrors.pm @@ -169,6 +169,9 @@ sub _load_cache { $@ and $urpm->{error}("failed to read " . cache_file($urpm) . ": $@"); $_->{nb_uses} = 0 foreach values %$cache; } + if ($ENV{URPMI_ADDMEDIA_PRODUCT_VERSION} && delete $cache->{'$MIRRORLIST'}) { + $urpm->{log}('not using cached mirror list $MIRRORLIST since URPMI_ADDMEDIA_PRODUCT_VERSION is set'); + } $cache || {}; } sub _save_cache { @@ -283,8 +286,9 @@ sub _mandriva_mirrorlist { my $arch = $o_arch || $product_id->{arch}; my @para = grep { $_ } $ENV{URPMI_ADDMEDIA_REASON}; + my $product_version = $ENV{URPMI_ADDMEDIA_PRODUCT_VERSION} || $product_id->{version}; - "http://api.mandriva.com/mirrors/$product_type.$product_id->{version}.$arch.list" + "http://api.mandriva.com/mirrors/$product_type.$product_version.$arch.list" . (@para ? '?' . join('&', @para) : ''); } |