diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-03-28 18:42:15 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-03-28 18:42:15 +0000 |
| commit | 31d8bbdc3d44ec41a8ad359d62ebfb2d0f35662d (patch) | |
| tree | 9fb1a0624c756cfcf54116bd8d909bc410f2dedd /Rpmdrake/pkg.pm | |
| parent | 780dbbaddf2ce82291ef4b616d9fc8335860a88d (diff) | |
| download | rpmdrake-31d8bbdc3d44ec41a8ad359d62ebfb2d0f35662d.tar rpmdrake-31d8bbdc3d44ec41a8ad359d62ebfb2d0f35662d.tar.gz rpmdrake-31d8bbdc3d44ec41a8ad359d62ebfb2d0f35662d.tar.bz2 rpmdrake-31d8bbdc3d44ec41a8ad359d62ebfb2d0f35662d.tar.xz rpmdrake-31d8bbdc3d44ec41a8ad359d62ebfb2d0f35662d.zip | |
perl_checker cleanups
Diffstat (limited to 'Rpmdrake/pkg.pm')
| -rw-r--r-- | Rpmdrake/pkg.pm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index f44ed9fb..4182dfa1 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -663,8 +663,11 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( return perform_parallel_install($urpm, $group, $w, \$statusbar_msg_id); } - my $lock = urpm::lock::urpmi_db($urpm, undef, wait => $urpm->{options}{wait_lock}) if !$::env; - my $rpm_lock = urpm::lock::rpm_db($urpm, 'exclusive') if !$::env; + my ($lock, $rpm_lock); + if (!$::env) { + $lock = urpm::lock::urpmi_db($urpm, undef, wait => $urpm->{options}{wait_lock}); + $rpm_lock = urpm::lock::rpm_db($urpm, 'exclusive'); + } my $state = $priority_state || $probe_only_for_updates ? { } : $urpm->{rpmdrake_state}; my $bar_id = statusbar_msg(N("Checking validity of requested packages..."), 0); @@ -743,7 +746,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-( } } - urpm::orphans::mark_as_requested($urpm, $state); + urpm::orphans::mark_as_requested($urpm, $state, 0); my ($progress, $total, @rpms_upgrade); my $transaction; |