summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog5
-rw-r--r--perl-install/detect_devices.pm2
-rw-r--r--perl-install/devices.pm4
-rw-r--r--perl-install/install_any.pm4
-rw-r--r--perl-install/install_steps_auto_install.pm4
-rw-r--r--perl-install/install_steps_gtk.pm2
-rw-r--r--perl-install/install_steps_interactive.pm1
-rw-r--r--perl-install/interactive.pm10
-rw-r--r--perl-install/mouse.pm7
-rw-r--r--perl-install/pkgs.pm2
10 files changed, 23 insertions, 18 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 2125ec320..85d13b581 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-06 Pixel <pixel@mandrakesoft.com>
+
+ * install_steps_gtk.pm (installPackages): removed the displaying
+ of size to install (people are bothered cuz not the same size)
+
2000-08-06 Dam's <damien@mandrakesoft.com>
* install_steps_gtk.pm (create_steps_window): use drawing area
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 26d124d25..a55a8b38f 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -277,7 +277,7 @@ sub whatPrinter() {
}
sub whatPrinterPort() {
- grep { tryWrite($_)} qw(/dev/lp0 /dev/lp1 /dev/lp2 /dev/usb/usblp0);
+ grep { tryWrite($_)} qw(/dev/lp0 /dev/lp1 /dev/lp2 /dev/usb/lp0);
}
sub probeUSB {
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index ae04b561c..6b7e1edd4 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -111,9 +111,7 @@ sub entry {
"sbpcd" => [ c::S_IFBLK(), 25, 0 ],
"sjcd" => [ c::S_IFBLK(), 18, 0 ],
"tty" => [ c::S_IFCHR(), 5, 0 ],
-# "usbmouse"=> [ c::S_IFCHR(), 10, 32], #- aka hidbp-mse-0
- "usbmouse"=> [ c::S_IFCHR(), 13, 32], #- aka /dev/input/mouse0
- "usbmice" => [ c::S_IFCHR(), 13, 63], #- aka /dev/input/mice
+ "usbmouse"=> [ c::S_IFCHR(), 13, 63], #- aka /dev/input/mice
"zero" => [ c::S_IFCHR(), 1, 5 ],
}}{$_} or die "unknown device $_ (caller is " . join(":", caller()) . ")" };
}
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 80b6f4f26..e972e8c5a 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -882,6 +882,7 @@ sub partitionWizard {
push @solutions, [ _("Use existing partition"), sub { $o->ask_mntpoint_s($o->{fstab}) } ];
} elsif (@l = grep { isFat($_) } @$fstab) {
}
+ require diskdrake;
push @solutions,
[ _("Take over the hard drive (beware!)"),
sub {
@@ -891,7 +892,8 @@ sub partitionWizard {
partition_table_raw::zero_MBR($hd);
fsedit::auto_allocate($hds, $o->{partitions});
1;
- } ];
+ } ],
+ [ _("Use diskdrake"), sub { diskdrake::main($hds, $o->{raid}, interactive_gtk->new, $o->{partitions}); 1 } ],
}
1;
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm
index 4c7c426e3..19a4358d9 100644
--- a/perl-install/install_steps_auto_install.pm
+++ b/perl-install/install_steps_auto_install.pm
@@ -23,8 +23,8 @@ sub new {
if ($graphical) {
require install_steps_gtk;
- undef *enteringStep; *enteringStep = *install_steps_gtk::enteringStep;
- undef *installPackages; *installPackages = *install_steps_gtk::installPackages;
+ undef *enteringStep; *enteringStep = \&install_steps_gtk::enteringStep;
+ undef *installPackages; *installPackages = \&install_steps_gtk::installPackages;
goto &install_steps_gtk::new;
} else {
(bless {}, ref $type || $type)->SUPER::new($o);
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 62993d55e..77ad2c850 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -568,7 +568,7 @@ sub installPackages {
$nb = $_[0];
$total_size = $_[1]; $current_total_size = 0;
$start_time = time();
- $msg->set(_("%d packages", $nb) . _(", %U MB", $total_size / sqr(1024)));
+ $msg->set(_("%d packages", $nb));
$w->flush;
} elsif ($m =~ /^Starting installing package/) {
$progress->update(0);
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 17ef94fb2..c47c442b3 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -935,6 +935,7 @@ sub configureX {
Xconfig::getinfoFromXF86Config($o->{X}, $o->{prefix});
}
}
+ $::force_xf3 = $::force_xf3; ; #- for no warning
$::force_xf3 = $o->ask_yesorno('',
_("DrakX will generate config files for both XFree 3.3 and XFree 4.0.
By default, the 4.0 server is used unless your card is not supported.
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 0ef20cc19..bad32cf8d 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -86,7 +86,7 @@ sub ask_okcancel($$$;$) {
sub ask_from_list_ {
my ($o, $title, $message, $l, $def) = @_;
- ask_from_listf($o, $title, $message, sub { translate($_[0]) }, @$l, $def);
+ ask_from_listf($o, $title, $message, sub { translate($_[0]) }, $l, $def);
}
sub ask_from_listf_ {
@@ -95,10 +95,12 @@ sub ask_from_listf_ {
}
sub ask_from_listf {
my ($o, $title, $message, $f, $l, $def) = @_;
- my %l; my $i = 0; foreach (@$l) {
- $l{$f->($_, $i++)} = $_;
+ my (@l,%l); my $i = 0; foreach (@$l) {
+ my $v = $f->($_, $i++);
+ push @l, $v;
+ $l{$v} = $_;
}
- my $r = ask_from_list($o, $title, $message, [ keys %l ], $f->($def)) or return;
+ my $r = ask_from_list($o, $title, $message, \@l, defined $def ? $f->($def) : $def) or return;
$l{$r};
}
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 578765f7b..94741db34 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -178,12 +178,9 @@ sub detect() {
modules::load("mousedev");
};
sleep(2);
- if (!$@) {
- my $dev;
- $dev ||= "usbmouse" if detect_devices::tryOpen("usbmouse");
- $dev ||= "usbmice" if detect_devices::tryOpen("usbmice");
+ if (!$@ && detect_devices::tryOpen("usbmouse")) {
$wacom or modules::unload("serial");
- return add2hash({ device => $dev }, name2mouse("USB Mouse")), $wacom;
+ return name2mouse("USB Mouse"), $wacom;
}
modules::unload("mousedev");
modules::unload("usbmouse");
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index dc3813baf..ed15573f7 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -248,7 +248,7 @@ sub mediumDescr {
}
#- selection, unselection of package.
-sub selectPackage($$;$$$) {
+sub selectPackage { #($$;$$$)
my ($packages, $pkg, $base, $otherOnly, $check_recursion) = @_;
#- check if the same or better version is installed,