summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-14 12:56:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-14 12:56:13 +0000
commit69d5432eb41ab9965f9e0c54446ac9d1504bdd3d (patch)
tree68b894e585a296d95db2ad05758656eb9293e701
parent422e84ca477a6293e449e3a82441302a483cc290 (diff)
downloadurpmi-69d5432eb41ab9965f9e0c54446ac9d1504bdd3d.tar
urpmi-69d5432eb41ab9965f9e0c54446ac9d1504bdd3d.tar.gz
urpmi-69d5432eb41ab9965f9e0c54446ac9d1504bdd3d.tar.bz2
urpmi-69d5432eb41ab9965f9e0c54446ac9d1504bdd3d.tar.xz
urpmi-69d5432eb41ab9965f9e0c54446ac9d1504bdd3d.zip
get rid of one $basename
-rw-r--r--urpm.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/urpm.pm b/urpm.pm
index 67435eb3..0c8954a8 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -1333,7 +1333,6 @@ this could happen if you mounted manually the directory when creating the medium
#- we can assume at this point a basename is existing, but it needs
#- to be checked for being valid, nothing can be deduced if no MD5SUM
#- file is present.
- my $basename = basename($with_hdlist_dir);
my $error;
@@ -1342,7 +1341,7 @@ this could happen if you mounted manually the directory when creating the medium
if (!$options->{nomd5sum} && file_size(reduce_pathname("$with_hdlist_dir/../MD5SUM")) > 32) {
recompute_local_md5sum($urpm, $medium, $options->{force});
if ($medium->{md5sum}) {
- $$retrieved_md5sum = parse_md5sum($urpm, reduce_pathname("$with_hdlist_dir/../MD5SUM"), $basename);
+ $$retrieved_md5sum = parse_md5sum($urpm, reduce_pathname("$with_hdlist_dir/../MD5SUM"), basename($with_hdlist_dir));
_read_existing_synthesis_and_hdlist_if_same_md5sum($urpm, $medium, $$retrieved_md5sum)
and return 'unmodified';
}