summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-03-31 18:04:40 +0000
committerThierry Vignaud <tv@mandriva.org>2009-03-31 18:04:40 +0000
commitf4a1ea549da7200b22a4f6d17459c86b62d6660a (patch)
tree8a8b577069e77b04b2b3c519d52d022bee8757ad
parentff4fea854b15677135fda9bb7424ce26ee2bfd0b (diff)
downloadurpmi-f4a1ea549da7200b22a4f6d17459c86b62d6660a.tar
urpmi-f4a1ea549da7200b22a4f6d17459c86b62d6660a.tar.gz
urpmi-f4a1ea549da7200b22a4f6d17459c86b62d6660a.tar.bz2
urpmi-f4a1ea549da7200b22a4f6d17459c86b62d6660a.tar.xz
urpmi-f4a1ea549da7200b22a4f6d17459c86b62d6660a.zip
(parse_media) fix latest commit 255088 from cfergeau: ->{debug} may
not always exist (#49354), side effect of #49226 fix
-rw-r--r--NEWS2
-rw-r--r--urpm/media.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 6c19f8c7..914f73db 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- prevent rpmdrake from crashing (#49354), side effect of #49226 fix
+
Version 6.25 - 31 March 2009
- downgrade cryptic log message to debug message, fixes #49226
diff --git a/urpm/media.pm b/urpm/media.pm
index c30ac585..92e46c9e 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -643,7 +643,7 @@ sub parse_media {
if ($_->{searchmedia}) {
$urpm->{searchmedia} = 1;
- $urpm->{debug}("Search start: %s end: %s", $_->{start}, $_->{end});
+ $urpm->{debug} and $urpm->{debug}("Search start: %s end: %s", $_->{start}, $_->{end});
}
$< == 0 and _generate_medium_names($urpm, $_);
rakx/tree/perl-install/Xconfigurator.pm?h=2.42&id=88a07c82cece62903ae68e1e2c482d810bbf8560'>perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -6,6 +6,7 @@ use vars qw($in $resolution_wanted @depths @resolutions @accelservers @allserver
use pci_probing::main;
use common qw(:common :file);
+use interactive_gtk;
use log;
use Xconfigurator_consts;
@@ -445,6 +446,16 @@ sub main {
write_XF86Config($o, "/tmp/Xconfig");
+ unless (fork) {
+ exec "X", ":9" or exit 1;
+ }
+
+ {
+ local $ENV{DISPLAY} = ":9";
+ my $w = interactive_gtk->new;
+ $w->ask_yesorno("Do you see this message");
+ }
+
# Success
rewriteInittab(rc & STARTX ? 5 : 3);
}