summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-26 20:30:40 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-26 20:30:40 +0000
commit5c2d545f720487b86403fecafc0a41b08d4e09fb (patch)
tree7c7b75c9d4704e15c899e92126734676a6cf635a
parenta7080d2dd762973e4fd32a5378f335c264f4681f (diff)
downloadurpmi-5c2d545f720487b86403fecafc0a41b08d4e09fb.tar
urpmi-5c2d545f720487b86403fecafc0a41b08d4e09fb.tar.gz
urpmi-5c2d545f720487b86403fecafc0a41b08d4e09fb.tar.bz2
urpmi-5c2d545f720487b86403fecafc0a41b08d4e09fb.tar.xz
urpmi-5c2d545f720487b86403fecafc0a41b08d4e09fb.zip
simplify
-rw-r--r--urpm/removable.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/urpm/removable.pm b/urpm/removable.pm
index 24a56538..c2e8db7a 100644
--- a/urpm/removable.pm
+++ b/urpm/removable.pm
@@ -184,14 +184,15 @@ sub _get_removables_or_check_mounted {
foreach (@$blists) {
my $medium = $_->{medium};
#- examine non removable device but that may be mounted.
- if ($medium->{removable}) {
- push @{$removables{$medium->{removable}} ||= []}, $_;
+ if (my $device = $medium->{removable}) {
+ next if $device =~ m![^a-zA-Z0-9_./-]!; #- bad path
+ push @{$removables{$device} ||= []}, $_;
} elsif (my $dir = file_from_local_url($medium->{url})) {
-e $dir || try_mounting($urpm, $dir) or
$urpm->{error}(N("unable to access medium \"%s\"", $medium->{name})), next;
}
}
- %removables;
+ values %removables;
}
sub _create_blists {
@@ -213,14 +214,13 @@ sub copy_packages_of_removable_media {
my $blists = _create_blists($urpm->{media}, $list);
- my %removables = _get_removables_or_check_mounted($urpm, $blists);
+ my @removables = _get_removables_or_check_mounted($urpm, $blists);
- foreach my $device (keys %removables) {
- next if $device =~ m![^a-zA-Z0-9_./-]!; #- bad path
+ foreach my $l (@removables) {
#- Here we have only removable devices.
#- If more than one media uses this device, we have to sort
#- needed packages to copy the needed rpm files.
- my @l = @{$removables{$device}};
+ my @l = @$l;
if (@l > 1) {
@l = sort { values(%{$a->{list}}) <=> values(%{$b->{list}}) } @l;