summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-04 15:40:43 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-04 15:40:43 +0000
commit086506b80163940864a3389a6ae36dd0f66d521b (patch)
treee89f98a53b40471eb9028adae1614d5e312ba69b
parentcb1d30b71cc6ce989cab51f4ffe9ca1a036c39a0 (diff)
downloaddrakx-086506b80163940864a3389a6ae36dd0f66d521b.tar
drakx-086506b80163940864a3389a6ae36dd0f66d521b.tar.gz
drakx-086506b80163940864a3389a6ae36dd0f66d521b.tar.bz2
drakx-086506b80163940864a3389a6ae36dd0f66d521b.tar.xz
drakx-086506b80163940864a3389a6ae36dd0f66d521b.zip
(empty_packages,main) log extra debugging messages if passing the 'debug_urpmi' option
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/install2.pm1
-rw-r--r--perl-install/install/pkgs.pm1
3 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 0670a03d6..2857a6fdc 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- log extra debugging messages if passing the 'debug_urpmi' option
+
Version 12.3 - 4 March 2009
- honor 'selected_names' for auto_install
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index af1100b5c..465c5ba42 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -344,6 +344,7 @@ sub main {
freedriver => sub { $o->{freedriver} = $v },
no_bad_drives => sub { $o->{partitioning}{no_bad_drives} = 1 },
nodmraid => sub { $o->{partitioning}{nodmraid} = 1 },
+ debug_urpmi => sub { $o->{debug_urpmi} = 1 },
readonly => sub { $o->{partitioning}{readonly} = $v ne "0" },
display => sub { $o->{display} = $v },
askdisplay => sub { print "Please enter the X11 display to perform the install on ? "; $o->{display} = chomp_(scalar(<STDIN>)) },
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 766edaebd..1b24f600a 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -305,6 +305,7 @@ sub empty_packages {
#- add additional fields used by DrakX.
@$packages{qw(count media)} = (0, []);
+ urpm::args::set_debug($packages) if $o->{debug_urpmi};
$packages->{log} = \&log::l;
$packages->{info} = \&log::l;
$packages->{error} = sub { $::o->ask_warn(undef, $_[0]) };