summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-10-20 21:27:49 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-10-20 21:27:49 +0000
commit5f3d5478cf4e2076b1deb610bfb66d584f659c7e (patch)
tree9250b398100be30df19ea9d43d1f83c9d92bcb4d
parent4a7fca6609507096c2f9cc29d4c12b508819e58d (diff)
downloaddrakx-5f3d5478cf4e2076b1deb610bfb66d584f659c7e.tar
drakx-5f3d5478cf4e2076b1deb610bfb66d584f659c7e.tar.gz
drakx-5f3d5478cf4e2076b1deb610bfb66d584f659c7e.tar.bz2
drakx-5f3d5478cf4e2076b1deb610bfb66d584f659c7e.tar.xz
drakx-5f3d5478cf4e2076b1deb610bfb66d584f659c7e.zip
no_comment
-rw-r--r--perl-install/Makefile2
-rw-r--r--perl-install/install_steps_interactive.pm3
-rw-r--r--perl-install/my_gtk.pm2
3 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile
index e0a4e91d2..e79fefc65 100644
--- a/perl-install/Makefile
+++ b/perl-install/Makefile
@@ -76,8 +76,8 @@ install_pms: $(DIRS)
dest=$(DESTREP4PMS)/`dirname $$i`; \
install -d $$dest; \
perl -ne 'print' $$i > $(DESTREP4PMS)/$$i; \
+ perl -ne 's/#-.*//; print unless (/^=head/ .. /^=cut/) || /use (diagnostics|vars|strict)/' $$i > $(DESTREP4PMS)/$$i; \
done
-# perl -ne 's/\s*#-.*//; print unless (/^=head/ .. /^=cut/) || /use (diagnostics|vars|strict)/' $$i > $(DESTREP4PMS)/$$i; \
cp *.rc $(DESTREP4PMS)
install -d $(DESTREP4PMS)/po
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 5458df1bd..98b7df3e5 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -380,7 +380,7 @@ name and directory should be used for this queue?"),
_("To use a remote lpd print queue, you need to supply
the hostname of the printer server and the queue name
on that server which jobs should be placed in."),
- [_("Remote hostname:"), _("Remote queue:")],
+ [_("Remote hostname:"), _("Remote queue")],
[\$o->{printer}{REMOTEHOST}, \$o->{printer}{REMOTEQUEUE}],
);
@@ -706,6 +706,7 @@ sub exitInstall {
return $o->{step} = '' unless $alldone || $o->ask_yesorno('',
_("Some steps are not completed.
+
Do you really want to quit now?"), 0);
$o->ask_warn('',
diff --git a/perl-install/my_gtk.pm b/perl-install/my_gtk.pm
index 2269baf5f..46fab9f25 100644
--- a/perl-install/my_gtk.pm
+++ b/perl-install/my_gtk.pm
@@ -380,7 +380,7 @@ my ($next_child, $left, $right, $up, $down);
};
}
-sub create_treeitem($$) {
+sub create_treeitem($) {
my ($name) = @_;
my $w = new Gtk::TreeItem($name);