summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/lang.pm3
-rwxr-xr-xperl-install/standalone/harddrake22
-rw-r--r--perl-install/ugtk2.pm2
3 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 5695022ab..c1371ecf9 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -904,7 +904,7 @@ sub system_locales_to_ourlocale {
$h->{main};
$locale->{lang} .= '@' . $h->{variant} if $h->{variant};
$locale->{country} = analyse_locale_name($locale_country)->{country};
- $locale->{utf8} = $h->{encoding} eq 'UTF-8';
+ $locale->{utf8} = $h->{encoding} && $h->{encoding} eq 'UTF-8';
#- safe fallbacks
$locale->{lang} ||= 'en_US';
$locale->{country} ||= 'US';
@@ -913,6 +913,7 @@ sub system_locales_to_ourlocale {
sub read {
my ($prefix, $user_only) = @_;
+ $prefix ||= "";
my ($f1, $f2) = ("$prefix$ENV{HOME}/.i18n", "$prefix/etc/sysconfig/i18n");
my %h = getVarsFromSh($user_only && -e $f1 ? $f1 : $f2);
system_locales_to_ourlocale($h{LC_MESSAGES} || 'en_US', $h{LC_MONETARY} || 'en_US');
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 38e897f37..37267f493 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -254,7 +254,7 @@ $tree->get_selection->signal_connect('changed' => sub {
show_hide(defined($current_device->{driver}) && $current_device->{driver} !~ /^unknown|^Bad|^Card|^Hsf|^Removable:|\|/, $module_cfg_button);
$current_configurator = $configurators[$idx];
- show_hide(-x first(split /\s+/, $current_configurator), $config_button); # strip arguments for -x test
+ show_hide($current_configurator && -x first(split /\s+/, $current_configurator), $config_button); # strip arguments for -x test
return 1;
}
}
diff --git a/perl-install/ugtk2.pm b/perl-install/ugtk2.pm
index 24cdf474b..9e8c2a47c 100644
--- a/perl-install/ugtk2.pm
+++ b/perl-install/ugtk2.pm
@@ -916,7 +916,7 @@ sub new {
}
$o->{rwindow}->set_position('center_always') if $force_center || $o->{force_center};
$o->{rwindow}->set_modal(1) if $grab || $o->{grab} || $o->{modal};
- $o->{rwindow}->set_transient_for($o->{transient}) if $o->{transient} =~ /Gtk2::Window/;
+ $o->{rwindow}->set_transient_for($o->{transient}) if $o->{transient} && $o->{transient} =~ /Gtk2::Window/;
} else {
$o->{rwindow} = $o->{window} = Gtk2::VBox->new(0,0);