summaryrefslogtreecommitdiffstats
path: root/urpm.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-13 16:09:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-13 16:09:10 +0000
commit1e39829f1eaff95dab8fcee820317b2e95047506 (patch)
treee305f146525c9b6fc3de9b851637fd945dfeec13 /urpm.pm
parent23872b749ac39531dd35fc06cb5e0b8468d2b6ec (diff)
downloadurpmi-1e39829f1eaff95dab8fcee820317b2e95047506.tar
urpmi-1e39829f1eaff95dab8fcee820317b2e95047506.tar.gz
urpmi-1e39829f1eaff95dab8fcee820317b2e95047506.tar.bz2
urpmi-1e39829f1eaff95dab8fcee820317b2e95047506.tar.xz
urpmi-1e39829f1eaff95dab8fcee820317b2e95047506.zip
cleanup
Diffstat (limited to 'urpm.pm')
-rw-r--r--urpm.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index 6b0e9cf9..5690ccc6 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1270,7 +1270,7 @@ sub _update_medium_first_pass {
#- list of rpm files for this medium, only available for local medium where
#- the source hdlist is not used (use force).
- my ($protocol, $dir, $error, $retrieved_md5sum, @files);
+ my ($dir, $error, $retrieved_md5sum, @files);
#- always delete a remaining list file or pubkey file in cache.
foreach (qw(list pubkey)) {
@@ -1279,7 +1279,6 @@ sub _update_medium_first_pass {
#- check if the medium is using a local or a removable medium.
if ($dir = file_from_local_url($medium->{url})) {
- $protocol = protocol_from_url($medium->{url});
#- check for a reconfig.urpmi file (if not already reconfigured)
if (!$medium_redone && !$medium->{noreconfigure}) {
my $reconfig_urpmi = reduce_pathname("$dir/reconfig.urpmi");
@@ -1639,6 +1638,8 @@ this could happen if you mounted manually the directory when creating the medium
#- sort list file contents according to id.
my %list;
if ($medium->{headers}) {
+ my $protocol = protocol_from_url($medium->{url});
+
#- rpm files have already been read (first pass), there is just a need to
#- build list hash.
foreach (@files) {