summaryrefslogtreecommitdiffstats
path: root/perl-install/printer/main.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-12-19 20:55:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-12-19 20:55:49 +0000
commit3e20a560e2632f77a6536f59d698eeeebea7a181 (patch)
tree18c9244d11f003a2594c5590c1a40f5d1ae625eb /perl-install/printer/main.pm
parentfd0b2d7966ee3c48142c813a87be8fe1bb004a70 (diff)
downloaddrakx-3e20a560e2632f77a6536f59d698eeeebea7a181.tar
drakx-3e20a560e2632f77a6536f59d698eeeebea7a181.tar.gz
drakx-3e20a560e2632f77a6536f59d698eeeebea7a181.tar.bz2
drakx-3e20a560e2632f77a6536f59d698eeeebea7a181.tar.xz
drakx-3e20a560e2632f77a6536f59d698eeeebea7a181.zip
- printer::main::read_cups_printer_list() is now printer::cups::read_printer_list() (but it is unused!)
- printer::main::get_cups_remote_queues() is now printer::cups::get_formatted_remote_queues() - cleanup printer::cups::get_remote_queues() using printer::cups::lpstat_v()
Diffstat (limited to 'perl-install/printer/main.pm')
-rw-r--r--perl-install/printer/main.pm39
1 files changed, 0 insertions, 39 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index 329834e0a..ebf29db59 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -627,45 +627,6 @@ sub set_cups_special_options {
return 1;
}
-#------------------------------------------------------------------------------
-sub lpstat_v {
- map {
- if (my ($queuename, $uri) = m/^\s*device\s+for\s+([^:\s]+):\s*(\S+)\s*$/) {
- +{ queuename => $queuename, uri => $uri, if_($uri =~ m!^ipp://([^/:]+)[:/]!, ipp => $1) };
- } else {
- ();
- }
- } run_program::rooted_get_stdout($::prefix, 'lpstat', '-v');
-}
-
-sub read_cups_printer_list {
- my ($printer) = @_;
- # This function reads in a list of all printers which the local CUPS
- # daemon currently knows, including remote ones.
- map {
- my $comment =
- $_->{ipp} && !$printer->{configured}{$_->{queuename}} ?
- N("(on %s)", $_->{ipp}) : N("(on this machine)");
- "$_->{queuename} $comment";
- } lpstat_v();
-}
-
-sub get_cups_remote_queues {
- my ($printer) = @_;
-
- # This function reads in a list of all remote printers which the local
- # CUPS daemon knows due to broadcasting of remote servers or
- # "BrowsePoll" entries in the local /etc/cups/cupsd.conf/
- map {
- join('!', if_($::expert, N("CUPS")), N("Remote Printers"), $_);
- } map {
- my $comment = N("On CUPS server \"%s\"", $_->{ipp}) . ($_->{queuename} eq $printer->{DEFAULT} ? N(" (Default)") : "");
- "$_->{queuename}: $comment";
- } grep {
- $_->{ipp} && !$printer->{configured}{$_->{queuename}};
- } lpstat_v();
-}
-
sub set_cups_autoconf {
my $autoconf = $_[0];