diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-07-30 17:08:08 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-07-30 17:08:08 +0000 |
| commit | c700f4f73a858b69eb7183aa25abb1f710563571 (patch) | |
| tree | ba8fa28c536a465b5c38a55b20cbc8fafd97dfa5 | |
| parent | f8ab79fd6e8e4bd9f3c86942e14fb77464f35096 (diff) | |
| download | drakx-backup-do-not-use-c700f4f73a858b69eb7183aa25abb1f710563571.tar drakx-backup-do-not-use-c700f4f73a858b69eb7183aa25abb1f710563571.tar.gz drakx-backup-do-not-use-c700f4f73a858b69eb7183aa25abb1f710563571.tar.bz2 drakx-backup-do-not-use-c700f4f73a858b69eb7183aa25abb1f710563571.tar.xz drakx-backup-do-not-use-c700f4f73a858b69eb7183aa25abb1f710563571.zip | |
use MDK::Common
i wonder why it was included and Till used an older version without merging?
| -rw-r--r-- | perl-install/printer.pm | 4 | ||||
| -rw-r--r-- | perl-install/printerdrake.pm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/printer.pm b/perl-install/printer.pm index 2947e3c75..52fde82fb 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -6,7 +6,7 @@ use strict; use vars qw(%thedb %spooler %spooler_inv %printer_type %printer_type_inv @entries_db_short @entry_db_description %descr_to_help %descr_to_db %db_to_descr %descr_to_ppd); -use common qw(:common :system :file); +use common; use commands; use run_program; @@ -114,7 +114,7 @@ sub read_configured_queues($) { my ($printer) = @_; my @QUEUES; # Get the default spooler choice from the config file - if (!($printer->{SPOOLER} ||= printer::get_default_spooler())) { + if (!($printer->{SPOOLER} ||= get_default_spooler())) { #- Find the first spooler where there are queues my $spooler; for $spooler (qw(cups pdq lprng lpd)) { diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index 5fb132131..18d368e78 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -4,7 +4,7 @@ package printerdrake; use diagnostics; use strict; -use common qw(:common :file :functional :system); +use common; use detect_devices; use commands; use modules; @@ -84,7 +84,7 @@ complete => sub { foreach (@parport) { $device eq $_->{port} or next; $printer->{DBENTRY} = - common::bestMatchSentence2($_->{val}{DESCRIPTION}, + bestMatchSentence($_->{val}{DESCRIPTION}, keys %printer::thedb); } 1; |