summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-07-03 10:48:15 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-07-03 10:48:15 +0000
commitb217860641d2dfb1973067012f6dc0e1784d0e81 (patch)
treeae1bf50da8d984445eee07b71d796ecb4d333c1d /urpm
parent3e08a5c96e88ccebbbc9df66645b8c0371b67fb2 (diff)
downloadurpmi-b217860641d2dfb1973067012f6dc0e1784d0e81.tar
urpmi-b217860641d2dfb1973067012f6dc0e1784d0e81.tar.gz
urpmi-b217860641d2dfb1973067012f6dc0e1784d0e81.tar.bz2
urpmi-b217860641d2dfb1973067012f6dc0e1784d0e81.tar.xz
urpmi-b217860641d2dfb1973067012f6dc0e1784d0e81.zip
re-indent
Diffstat (limited to 'urpm')
-rw-r--r--urpm/select.pm36
1 files changed, 19 insertions, 17 deletions
diff --git a/urpm/select.pm b/urpm/select.pm
index 33aa9018..46defeba 100644
--- a/urpm/select.pm
+++ b/urpm/select.pm
@@ -488,24 +488,26 @@ sub find_packages_to_remove {
sub find_removed_from_basesystem {
my ($urpm, $db, $state, $callback_base) = @_;
- if ($callback_base && %{$state->{rejected} || {}}) {
- my %basepackages;
- my @dont_remove = ('basesystem', 'basesystem-minimal',
- split /,\s*/, $urpm->{global_config}{'prohibit-remove'});
- #- check if a package to be removed is a part of basesystem requires.
- $db->traverse_tag('whatprovides', \@dont_remove, sub {
- my ($p) = @_;
- $basepackages{$p->fullname} = 0;
- });
- foreach (removed_packages($urpm, $state)) {
- exists $basepackages{$_} or next;
- ++$basepackages{$_};
- }
- if (grep { $_ } values %basepackages) {
- return $callback_base->($urpm, grep { $basepackages{$_} } keys %basepackages);
- }
+
+ $callback_base && %{$state->{rejected} || {}} or return 1;
+
+ my %basepackages;
+ my @dont_remove = ('basesystem', 'basesystem-minimal',
+ split /,\s*/, $urpm->{global_config}{'prohibit-remove'});
+ #- check if a package to be removed is a part of basesystem requires.
+ $db->traverse_tag('whatprovides', \@dont_remove, sub {
+ my ($p) = @_;
+ $basepackages{$p->fullname} = 0;
+ });
+ foreach (removed_packages($urpm, $state)) {
+ exists $basepackages{$_} or next;
+ ++$basepackages{$_};
+ }
+ if (grep { $_ } values %basepackages) {
+ return $callback_base->($urpm, grep { $basepackages{$_} } keys %basepackages);
}
- return 1;
+
+ 1;
}
#- misc functions to help finding ask_unselect and ask_remove elements with their reasons translated.