no_comment

4 files changed, 7 insertions, 7 deletions

diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index cdebe6608..6b7de468f 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -367,7 +367,7 @@ sub verifyHds {
     if ($readonly && !$ok) {
 	log::l("using /proc/partitions as diskdrake failed :(");
 	foreach my $hd (@$hds) {
-	    $hd->{primary} = [ grep { $hd->{device} eq $_->{rootDevice} } @parts ];
+	    $hd->{primary} = { normal => [ grep { $hd->{device} eq $_->{rootDevice} } @parts ] };
 	    delete $hd->{extended};
 	}
     }
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 1fb53407e..4ee222fe3 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -191,7 +191,7 @@ I'll try to go on blanking bad partitions")) unless $o->{partitioning}{readonly}
 
     $o->ask_warn('', 
 _("DiskDrake failed to read correctly the partition table.
-Continue at your own risk!")) if !$ok2 && $ok;
+Continue at your own risk!")) if !$ok2 && $ok && !$o->{partitioning}{readonly};
 
     $ok2;
 }
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 1f0670a57..e84da88e2 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -2,7 +2,7 @@ package my_gtk;
 
 use diagnostics;
 use strict;
-use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $border);
+use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $border @grabbed);
 
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -18,7 +18,6 @@ use c;
 use common qw(:common :functional);
 
 my $forgetTime = 1000; #- in milli-seconds
-my @grabbed;
 $border = 5;
 
 1;
@@ -33,6 +32,10 @@ sub new {
     my $o = bless { %opts }, $type;
     $o->_create_window($title);
     push @interactive::objects, $o unless $opts{no_interactive_objects};
+
+    top(@grabbed)->grab_remove if @grabbed;
+    push(@grabbed, $o->{rwindow}), $o->{rwindow}->grab_add if $my_gtk::grab || $o->{grab};
+
     $o;
 }
 sub main($;$) {
@@ -50,8 +53,6 @@ sub show($) {
     my ($o) = @_;
     $o->{window}->show;
     $o->{rwindow}->show;
-    top(@grabbed)->grab_remove if @grabbed;
-    push(@grabbed, $o->{rwindow}), $o->{rwindow}->grab_add if $my_gtk::grab || $o->{grab};
 }
 sub destroy($) {
     my ($o) = @_;
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 51cf3f0f7..c46d26b93 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -420,7 +420,6 @@ sub install($$) {
 	$p->{file} ||= sprintf "%s-%s-%s.%s.rpm",
 	                       $p->{name}, $p->{version}, $p->{release},
 			       c::headerGetEntry(getHeader($p), 'arch');
-	print $p->{file}, "\n";
 	c::rpmtransAddPackage($trans, getHeader($p), $p->{file}, $p->{name} !~ /kernel/); #- TODO: replace `named kernel' by `provides kernel'
 #	c::rpmtransAddPackage($trans, getHeader($p), $p->{file}, 1); #- TODO: replace `named kernel' by `provides kernel'
 	$nb++;