summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-06-03 07:12:04 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-06-03 07:12:04 +0000
commitb93ada182dd9bb850328810ad2bc0af14bd7e2a0 (patch)
tree291b3506599a93b6341ca6083283ee4428228b45
parent204480447ce4d4c09db3f4dc4ea31b2364faea09 (diff)
downloadurpmi-b93ada182dd9bb850328810ad2bc0af14bd7e2a0.tar
urpmi-b93ada182dd9bb850328810ad2bc0af14bd7e2a0.tar.gz
urpmi-b93ada182dd9bb850328810ad2bc0af14bd7e2a0.tar.bz2
urpmi-b93ada182dd9bb850328810ad2bc0af14bd7e2a0.tar.xz
urpmi-b93ada182dd9bb850328810ad2bc0af14bd7e2a0.zip
This wasn't a good idea
-rw-r--r--urpm.pm5
-rwxr-xr-xurpmi10
2 files changed, 9 insertions, 6 deletions
diff --git a/urpm.pm b/urpm.pm
index b8282a92..f70ea7bf 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -2498,7 +2498,7 @@ sub get_source_packages {
$urpm->{error}(N("medium \"%s\" does not define any location for rpm files", $medium->{name}));
}
}
- push @list, \%sources if keys %sources;
+ push @list, \%sources;
}
#- examine package list to see if a package has not been found.
@@ -2622,7 +2622,8 @@ sub copy_packages_of_removable_media {
my %removables;
#- make sure everything is correct on input...
- @{$urpm->{media} || []} == @$list or return;
+ $urpm->{media} or return;
+ @{$urpm->{media}} == @$list or return;
#- examine if given medium is already inside a removable device.
my $check_notfound = sub {
diff --git a/urpmi b/urpmi
index 01f2bce9..5cf476f2 100755
--- a/urpmi
+++ b/urpmi
@@ -447,7 +447,7 @@ my @root_only;
foreach my $pkg (sort { $a->name cmp $b->name } @{$urpm->{depslist}}[keys %{$state->{selected}}]) {
#- reflect change in flag usage, now requested is set whatever a package is selected or not,
- #- but required is always set (so a required but not requested is a pure dependencies).
+ #- but required is always set (so a required but not requested is a pure dependency).
$ask_user ||= !$pkg->flag_requested || $auto_select || $parallel;
my $fullname = $pkg->fullname;
@@ -481,9 +481,11 @@ if (@root_only) {
message_input("$msg:\n$p\n$msg2" . N(" (Y/n) "), $force && $yesexpr, boolean => 1) =~ /[$noexpr]/ and exit 0;
}
-my ($local_sources, $list) = $urpm->get_source_packages($state->{selected},
- clean_all => $clean,
- clean_other => !$noclean && $urpm->{options}{'pre-clean'});
+my ($local_sources, $list) = $urpm->get_source_packages(
+ $state->{selected},
+ clean_all => $clean,
+ clean_other => !$noclean && $urpm->{options}{'pre-clean'},
+);
unless ($local_sources || $list) {
$urpm->{fatal}(3, N("unable to get source packages, aborting"));
}