aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake/pkg.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-09-09 17:32:16 +0000
committerThierry Vignaud <tv@mandriva.org>2008-09-09 17:32:16 +0000
commit01426829d6a8ea0e4fe376cc503b065d7e63bfa7 (patch)
tree684518fc16453e351ccf1527dd345fc9a4d1bda6 /Rpmdrake/pkg.pm
parent4330f9dd2203fd7b42f22c13624c40ae88dadcae (diff)
downloadrpmdrake-01426829d6a8ea0e4fe376cc503b065d7e63bfa7.tar
rpmdrake-01426829d6a8ea0e4fe376cc503b065d7e63bfa7.tar.gz
rpmdrake-01426829d6a8ea0e4fe376cc503b065d7e63bfa7.tar.bz2
rpmdrake-01426829d6a8ea0e4fe376cc503b065d7e63bfa7.tar.xz
rpmdrake-01426829d6a8ea0e4fe376cc503b065d7e63bfa7.zip
(fast_open_urpmi_db,perform_installation) add basic support for the --debug option
Diffstat (limited to 'Rpmdrake/pkg.pm')
-rw-r--r--Rpmdrake/pkg.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm
index fb080f63..66705fa5 100644
--- a/Rpmdrake/pkg.pm
+++ b/Rpmdrake/pkg.pm
@@ -624,8 +624,8 @@ 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});
- my $rpm_lock = urpm::lock::rpm_db($urpm, 'exclusive');
+ 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 $state = $priority_state || $probe_only_for_updates ? { } : $urpm->{rpmdrake_state};
my $bar_id = statusbar_msg(N("Checking validity of requested packages..."), 0);
@@ -634,6 +634,7 @@ sub perform_installation { #- (partially) duplicated from /usr/sbin/urpmi :-(
my $requested = { map { $_->id => undef } grep { $_->flag_selected } @{$urpm->{depslist}} };
urpm::select::resolve_dependencies(
$urpm, $state, $requested,
+ rpmdb => $::env && "$::env/rpmdb.cz",
callback_choices => \&Rpmdrake::gui::callback_choices,
);
statusbar_msg_remove($bar_id);