diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-10-15 00:49:48 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-10-15 00:49:48 +0000 |
| commit | 1bd0d70a43bc734b826ae3f181b057aa22c977d7 (patch) | |
| tree | d6d052d0b5944dd308dbe5b496f0767a9ff3891c | |
| parent | 613c0e3b6d083c8a552e6e8b34bf0e52a4b4f23b (diff) | |
| download | drakx-backup-do-not-use-1bd0d70a43bc734b826ae3f181b057aa22c977d7.tar drakx-backup-do-not-use-1bd0d70a43bc734b826ae3f181b057aa22c977d7.tar.gz drakx-backup-do-not-use-1bd0d70a43bc734b826ae3f181b057aa22c977d7.tar.bz2 drakx-backup-do-not-use-1bd0d70a43bc734b826ae3f181b057aa22c977d7.tar.xz drakx-backup-do-not-use-1bd0d70a43bc734b826ae3f181b057aa22c977d7.zip | |
no_comment
| -rw-r--r-- | perl-install/commands.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 | ||||
| -rw-r--r-- | perl-install/my_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/partition_table.pm | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/commands.pm b/perl-install/commands.pm index 3ff726617..d86ef2c19 100644 --- a/perl-install/commands.pm +++ b/perl-install/commands.pm @@ -336,7 +336,7 @@ sub strings { sub hexdump { my $i = 0; $/ = \16; @ARGV = @_; while (<>) { printf "%08lX ", $i; $i += 16; - print join(" ", map({ sprintf "%02X", $_ } unpack("C*", $_)), + print join(" ", (map { sprintf "%02X", $_ } unpack("C*", $_)), ($_ =~ s/[^$printable_chars]/./og, $_)[1]), "\n"; } } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 1d08f6da2..cf051fa1c 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -742,7 +742,7 @@ sub load_module { my @names = modparm::get_options_name($m); - if ((!defined @names || @names > 0) && $o->ask_from_list('', + if ((@names != 0) && $o->ask_from_list('', _("In some cases, the %s driver needs to have extra information to work properly, although it normally works fine without. Would you like to specify extra options for it or allow the driver to probe your machine for the @@ -750,7 +750,7 @@ information it needs? Occasionally, probing will hang a computer, but it should not cause any damage.", $l), [ __("Autoprobe"), __("Specify options") ], "Autoprobe") ne "Autoprobe") { ASK: - if (defined @names) { + if (@names >= 0) { my @l = $o->ask_from_entries('', _("You may now provide its options to module %s.", $l), \@names) or return; diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 94f1ec283..43465ec9d 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -156,7 +156,7 @@ sub text2driver($) { } -sub load($;$@) { +sub load { my ($name, $type, @options) = @_; if ($::testing) { diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm index 02812483f..8eefa123c 100644 --- a/perl-install/my_gtk.pm +++ b/perl-install/my_gtk.pm @@ -201,7 +201,7 @@ sub create_box_with_title($@) { @_ = map { ref $_ ? $_ : warp_text($_) } @_; $o->{box} = gtkpack_(new Gtk::VBox(0,0), - map({ + (map{ my $w = ref $_ ? $_ : new Gtk::Label($_); $w->set_name("Title"); 0, $w; diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index 88bf8ef83..6ad004814 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -255,7 +255,7 @@ sub read($;$) { 1; } -sub read_extended($$) { +sub read_extended { my ($hd, $extended) = @_; my $pt = read_one($hd, $extended->{start}) or return 0; |