summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-07-24 10:23:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-07-24 10:23:21 +0000
commit7e5672eb837597a08dc886dc022f704be9b97665 (patch)
tree51aba798e9eb6501aa32cc1cfdbf4d759a031b3b /perl-install/standalone
parent5d8a5663900537c6695f08692920d666f5ec9213 (diff)
downloaddrakx-7e5672eb837597a08dc886dc022f704be9b97665.tar
drakx-7e5672eb837597a08dc886dc022f704be9b97665.tar.gz
drakx-7e5672eb837597a08dc886dc022f704be9b97665.tar.bz2
drakx-7e5672eb837597a08dc886dc022f704be9b97665.tar.xz
drakx-7e5672eb837597a08dc886dc022f704be9b97665.zip
generalize the use of chomp_ as the functional alternative to chomp (and works on lists)
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/diskdrake2
-rwxr-xr-xperl-install/standalone/draknet4
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake
index 57a6045a0..7bf80d398 100755
--- a/perl-install/standalone/diskdrake
+++ b/perl-install/standalone/diskdrake
@@ -68,7 +68,7 @@ my ($hds, $lvms) =
I'll try to go on blanking bad partitions"), $err]);
};
-$SIG{__DIE__} = sub { chomp (my $m = $_[0]); log::l("ERROR: $m") };
+$SIG{__DIE__} = sub { my $m = chomp_($_[0]); log::l("ERROR: $m") };
my $fstab = [ fsedit::get_fstab(@$hds, @$lvms) ];
fs::get_mntpoints_from_fstab($fstab);
diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet
index 374a0e423..37d9cadcf 100755
--- a/perl-install/standalone/draknet
+++ b/perl-install/standalone/draknet
@@ -138,7 +138,7 @@ $hbox1->pack_start($button_new,0,0,5);
my $hbox2 = new Gtk::HBox(0,0);
$vbox1->pack_start($hbox2,1,1,0);
$hbox2->pack_start(new Gtk::Label(_("Hostname: ")),0,0,0);
-chop (my $hostname = `hostname`);
+my $hostname = chomp_(`hostname`);
my $label_host = new Gtk::Label($hostname);
$hbox2->pack_start($label_host,0,0,0);
@@ -348,7 +348,7 @@ sub apply {
}
sub update {
- chop (my $h = `hostname`);
+ my $h = chomp_(`hostname`);
$label_host->set ($h);
$label4->set($netcnx->{type});
$label5->set($netcnx->{type} eq 'lan' ? _("Gateway:") : _("Interface:"));