summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-07-23 02:09:42 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-07-23 02:09:42 +0000
commit7b99fbd1d318145be9ac33bededb3afb88d86303 (patch)
treef9f529ff2b71cb168dd248339baf6f3fe5540c9c
parent1bf29c3c503679fd86ac8a39d3fb5411b8f66066 (diff)
downloadurpmi-7b99fbd1d318145be9ac33bededb3afb88d86303.tar
urpmi-7b99fbd1d318145be9ac33bededb3afb88d86303.tar.gz
urpmi-7b99fbd1d318145be9ac33bededb3afb88d86303.tar.bz2
urpmi-7b99fbd1d318145be9ac33bededb3afb88d86303.tar.xz
urpmi-7b99fbd1d318145be9ac33bededb3afb88d86303.zip
Simplify search for reconfig.urpmi.
-rw-r--r--urpm.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index 759354d2..ec64424c 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -978,8 +978,7 @@ sub update_media {
if (($prefix, $dir) = $medium->{url} =~ m!^(removable[^:]*|file):/(.*)!) {
#- check for a reconfig.urpmi file (if not already reconfigured)
if (!$media_redone{$medium->{name}}) {
- my $reconfig_urpmi = reduce_pathname("$medium->{url}/reconfig.urpmi");
- $reconfig_urpmi =~ s,^(removable[^:]*|file)://,,;
+ my $reconfig_urpmi = reduce_pathname("$dir/reconfig.urpmi");
if (-s $reconfig_urpmi && $urpm->reconfig_urpmi($reconfig_urpmi, $medium->{name})) {
$media_redone{$medium->{name}} = 1;
redo MEDIA;