summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2004-03-01 13:05:43 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2004-03-01 13:05:43 +0000
commitbb8ff5a0723124de9ed8d08bb747352afdd766d7 (patch)
tree423fed8634ec90e830acf320da2b0e91969c2a74
parent65137633a818e105c7ab9daf7ff65a762486d339 (diff)
downloaddrakx-bb8ff5a0723124de9ed8d08bb747352afdd766d7.tar
drakx-bb8ff5a0723124de9ed8d08bb747352afdd766d7.tar.gz
drakx-bb8ff5a0723124de9ed8d08bb747352afdd766d7.tar.bz2
drakx-bb8ff5a0723124de9ed8d08bb747352afdd766d7.tar.xz
drakx-bb8ff5a0723124de9ed8d08bb747352afdd766d7.zip
Fixed bug of installer crashing when an HP multi-function device is detected and set up.
-rw-r--r--perl-install/printer/main.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index c6209b98e..bf09563af 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -2139,7 +2139,10 @@ sub configure_hpoj {
while (<PTALINIT>) {
if (m!sub main!) {
last;
- } elsif (m!^[^\#]!) {
+ } elsif ((m!^[^\#]!) && !(m!^\s*exec\b!)){
+ # Comment lines and the "exec" line (probably obsolete
+ # Red Hat workaround) are skipped.
+
# Make the subroutines also working during installation
if ($::isInstall) {
s!\$::prefix!\$hpoj_prefix!g;