aboutsummaryrefslogtreecommitdiffstats
path: root/Rpmdrake/open_db.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/open_db.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/open_db.pm')
-rw-r--r--Rpmdrake/open_db.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/Rpmdrake/open_db.pm b/Rpmdrake/open_db.pm
index d33f1b1c..7b6cd896 100644
--- a/Rpmdrake/open_db.pm
+++ b/Rpmdrake/open_db.pm
@@ -70,6 +70,10 @@ sub fast_open_urpmi_db() {
urpm::args::set_root($urpm, $::rpmdrake_options{'rpm-root'}[0]) if $::rpmdrake_options{'rpm-root'}[0];
urpm::args::set_debug($urpm) if $::rpmdrake_options{'debug'};
urpm::args::set_verbosity();
+ if ($::rpmdrake_options{env} && $::rpmdrake_options{env}[0]) {
+ $::env = $::rpmdrake_options{env}[0];
+ urpm::set_env($urpm, $::env);
+ }
$urpm::args::rpmdrake_options{justdb} = $::rpmdrake_options{justdb};
@@ -99,7 +103,7 @@ sub open_urpmi_db {
my $media = ref $::rpmdrake_options{media} ? join(',', @{$::rpmdrake_options{media}}) : '';
my $searchmedia = $urpmi_options{update} ? undef : join(',', get_inactive_backport_media($urpm));
- $urpm->{lock} = urpm::lock::urpmi_db($urpm, undef, wait => $urpm->{options}{wait_lock});
+ $urpm->{lock} = urpm::lock::urpmi_db($urpm, undef, wait => $urpm->{options}{wait_lock}) if !$::env;
my $previous = $::rpmdrake_options{'previous-priority-upgrade'};
urpm::select::set_priority_upgrade_option($urpm, (ref $previous ? join(',', @$previous) : ()));
urpm::media::configure($urpm, media => $media, if_($searchmedia, searchmedia => $searchmedia), %urpmi_options);