summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-11-16 20:11:15 +0000
committerThierry Vignaud <tv@mageia.org>2012-11-16 20:11:15 +0000
commiteac002324319c9456128840dee10ea5a320f49e3 (patch)
tree2c6c79c69a48a14f36961d12d06d5edb6248974d /urpm
parentca6e0f1246c2c833a8ad4ee68552deb97584bbec (diff)
downloadurpmi-eac002324319c9456128840dee10ea5a320f49e3.tar
urpmi-eac002324319c9456128840dee10ea5a320f49e3.tar.gz
urpmi-eac002324319c9456128840dee10ea5a320f49e3.tar.bz2
urpmi-eac002324319c9456128840dee10ea5a320f49e3.tar.xz
urpmi-eac002324319c9456128840dee10ea5a320f49e3.zip
(install) add spacing
Diffstat (limited to 'urpm')
-rw-r--r--urpm/install.pm6
1 files changed, 6 insertions, 0 deletions
diff --git a/urpm/install.pm b/urpm/install.pm
index e2e7dcab..f56ce6f9 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -214,6 +214,7 @@ sub install {
$urpm->{error}("unable to remove package " . $_);
}
}
+
my @trans_pkgs;
foreach my $mode ($install, $upgrade) {
foreach (keys %$mode) {
@@ -247,6 +248,7 @@ sub install {
}
++$update;
}
+
if (!$options{nodeps} && (@errors = $trans->check(%options))) {
} elsif (!$options{noorder} && (@errors = $trans->order)) {
} else {
@@ -274,6 +276,7 @@ sub install {
get_README_files($urpm, $trans, $urpm->{depslist}[$pkgid]) if !$is_test;
close $fh if defined $fh;
};
+
#- ensure perl does not create a circular reference below, otherwise all this won't be collected,
# and rpmdb won't be closed
my ($verbose, $callback_report_uninst) = ($options{verbose}, $options{callback_report_uninst});
@@ -293,10 +296,12 @@ sub install {
$index++;
}
};
+
if ($options{verbose} >= 0 && @trans_pkgs) {
$options{callback_inst} ||= \&install_logger;
$options{callback_trans} ||= \&install_logger;
}
+
@errors = $trans->run($urpm, %options);
#- don't clear cache if transaction failed. We might want to retry.
@@ -319,6 +324,7 @@ sub install {
}
}
}
+
unlink @produced_deltas;
urpm::sys::may_clean_rpmdb_shared_regions($urpm, $options{test});