From 91fa5771511a58bc1dbc33f3a5d65174ec76470c Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Fri, 5 Mar 2004 03:11:09 +0000
Subject: Let URIs listed by "lpinfo -v" be shown in the dialog for entering a
 URI manually.

---
 perl-install/printer/cups.pm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'perl-install/printer/cups.pm')

diff --git a/perl-install/printer/cups.pm b/perl-install/printer/cups.pm
index 468625d65..ab9e28b21 100644
--- a/perl-install/printer/cups.pm
+++ b/perl-install/printer/cups.pm
@@ -77,6 +77,22 @@ sub lpstat_v() {
     } run_program::rooted_get_stdout($::prefix, 'lpstat', '-v');
 }
 
+sub lpinfo_v() {
+    map {
+	if (my ($type, $uri) = m/^\s*(\S+)\s+(\S+)\b/) {
+	    if ($uri =~ m!:/!) {
+		$uri;
+	    } elsif ($type =~ m/network/i) {
+		"$uri://";
+	    } else {
+		"$uri:/";
+	    }
+	} else {
+	    ();
+	}
+    } run_program::rooted_get_stdout($::prefix, 'lpinfo', '-v');
+}
+
 sub read_printer_list {
     my ($printer) = @_;
     # This function reads in a list of all printers which the local CUPS
-- 
cgit v1.2.1