summaryrefslogtreecommitdiffstats
path: root/perl-install/printer/printerdrake.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-02-16 13:35:35 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-02-16 13:35:35 +0000
commit6d2d2c97967b66528d84b1400431d58cccc00a4b (patch)
tree6d33b96d521237ae62ec1986dbb24290f93f4d7a /perl-install/printer/printerdrake.pm
parent34f248eeebe180e56da780d1c5aa4c662ee652a6 (diff)
downloaddrakx-6d2d2c97967b66528d84b1400431d58cccc00a4b.tar
drakx-6d2d2c97967b66528d84b1400431d58cccc00a4b.tar.gz
drakx-6d2d2c97967b66528d84b1400431d58cccc00a4b.tar.bz2
drakx-6d2d2c97967b66528d84b1400431d58cccc00a4b.tar.xz
drakx-6d2d2c97967b66528d84b1400431d58cccc00a4b.zip
- If a printer is set up with HPLIP and has still an old HPOJ configuration,
it will be automatically removed now.
Diffstat (limited to 'perl-install/printer/printerdrake.pm')
-rw-r--r--perl-install/printer/printerdrake.pm15
1 files changed, 15 insertions, 0 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 3e8ab3eda..328593d32 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -2148,6 +2148,21 @@ sub setup_common {
};
}
}
+ # Remove old HPOJ configuration for this device
+ if (-f "/usr/sbin/ptal-mlcd") { # HPOJ installed?
+ if (my $configfile =
+ printer::main::remove_hpoj_config($device, @autodetected)) {
+ if (!$printer->{noninteractive} && !$::noX) {
+ undef $w;
+ local $::isWizard = 0;
+ $in->ask_warn
+ (N("Error"),
+ N("Could not remove your old HPOJ configuration file %s for your %s! ",
+ $configfile, $makemodel) .
+ N("Please remove the file manually and restart HPOJ."));
+ }
+ }
+ }
# Start HPLIP and get device URI
undef $w;
$w = $in->wait_message(