summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-09-15 16:31:25 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-09-15 16:31:25 +0000
commite032df45a0b6c4caf6bbd15d062c15e0058d372a (patch)
tree632702a69a894c3382933d9d1044371103527724 /perl-install
parent34061a6d5814ec913c044861d5e6a3f38ac7ec9c (diff)
downloaddrakx-e032df45a0b6c4caf6bbd15d062c15e0058d372a.tar
drakx-e032df45a0b6c4caf6bbd15d062c15e0058d372a.tar.gz
drakx-e032df45a0b6c4caf6bbd15d062c15e0058d372a.tar.bz2
drakx-e032df45a0b6c4caf6bbd15d062c15e0058d372a.tar.xz
drakx-e032df45a0b6c4caf6bbd15d062c15e0058d372a.zip
Put device identity info into the HPOJ config file also when HPOJ
configuration was not verified (LIDIL devices).
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/printer/main.pm5
1 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index d692f79d9..a099eac69 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -2282,6 +2282,11 @@ sub configure_hpoj {
}
# No, it is not an HP multi-function device.
return "" if !$device_ok;
+
+ # If $model_long and $serialnumber_long stay empty, fill them with
+ # $model and $serialnumber
+ $model_long ||= $model;
+ $serialnumber_long ||= $serialnumber;
# Determine the ptal device name from already existing config files
my $ptalprefix =