summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-09 17:59:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-09 17:59:13 +0000
commitf0345dc2b5e47697325162c256d90b9dc6e0f372 (patch)
tree832f5bc861e2697b5f68b6f853434a07f899dc2f
parent935fff1506bda8ffb065c5d6b2ba32e008611404 (diff)
downloadurpmi-f0345dc2b5e47697325162c256d90b9dc6e0f372.tar
urpmi-f0345dc2b5e47697325162c256d90b9dc6e0f372.tar.gz
urpmi-f0345dc2b5e47697325162c256d90b9dc6e0f372.tar.bz2
urpmi-f0345dc2b5e47697325162c256d90b9dc6e0f372.tar.xz
urpmi-f0345dc2b5e47697325162c256d90b9dc6e0f372.zip
perl_checker compliance
-rw-r--r--urpm.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/urpm.pm b/urpm.pm
index b0f2c2ac..01f389a5 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -2053,10 +2053,10 @@ sub clean {
}
sub try_mounting {
- my ($urpm, $dir, $removable) = @_;
+ my ($urpm, $dir, $o_removable) = @_;
my %infos;
- my $is_iso = is_iso($removable);
+ my $is_iso = is_iso($o_removable);
my @mntpoints = $is_iso
#- note: for isos, we don't parse the fstab because it might not be declared in it.
#- so we try to remove suffixes from the dir name until the dir exists
@@ -2070,13 +2070,13 @@ sub try_mounting {
if ($is_iso) {
#- to mount an iso image, grab the first loop device
my $loopdev = urpm::sys::first_free_loopdev();
- sys_log("mount iso $_ on $removable");
- $loopdev and system('mount', $removable, $_, '-t', 'iso9660', '-o', "loop=$loopdev");
+ sys_log("mount iso $_ on $o_removable");
+ $loopdev and system('mount', $o_removable, $_, '-t', 'iso9660', '-o', "loop=$loopdev");
} else {
sys_log("mount $_");
system("mount '$_' 2>/dev/null");
}
- $removable && $infos{$_}{fs} ne 'supermount' and $urpm->{removable_mounted}{$_} = undef;
+ $o_removable && $infos{$_}{fs} ne 'supermount' and $urpm->{removable_mounted}{$_} = undef;
}
-e $dir;
}