Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/hal-cups-utils/patches/00-hal_lpadmin.patch
author Stefan Teleman <stefan.teleman@oracle.com>
Wed, 14 Aug 2013 12:01:30 -0700
branchs11-update
changeset 2731 d2ccaa434c25
parent 160 4eabca2bceee
permissions -rw-r--r--
17213162 include/loc/_collate.h (collate_byname) should be a virtual destructor 17061683 stdcxx needs extra stuff in the license attribution
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
160
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     1
 
--- systemv/hal_lpadmin.orig	Tue Apr 14 22:13:11 2009
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     2
 
+++ systemv/hal_lpadmin	Tue Apr 14 22:13:21 2009
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     3
 
@@ -283,7 +284,8 @@
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     4
 
         uris=["hal://%s" % self.uid]
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     5
 
         if self.properties.has_key("printer.vendor"):
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     6
 
             vendor = self.properties["printer.vendor"].lower ()
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     7
 
-            if (self.properties.get("linux.subsystem","") == "usb" and
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     8
 
+            if ((self.properties.get("linux.subsystem","") == "usb" or
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
     9
 
+                 self.properties.get("info.solaris.driver","") == "usbprn") and
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    10
 
                 self.properties.has_key("printer.product")):
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    11
 
                 # Use a 'usb:...' URI.  Use the same method the CUPS
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    12
 
                 # usb backend uses to construct it.
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    13
 
@@ -609,6 +611,9 @@
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    14
 
                     resg = res.groups()
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    15
 
                     serial = resg[0]
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    16
 
         bus = self.properties.get ("linux.subsystem", None)
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    17
 
+	if ((bus == None) and
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    18
 
+            (self.properties.get("info.solaris.driver", None) == 'usbprn')):
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    19
 
+		bus = 'usb'
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    20
 
         udi = self.properties.get ("info.udi", None)
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    21
 
         if make:
4eabca2bceee 7032426 hal-cups-utils needs to move to userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset 
    22
 
             makel = make.lower ()
upstream/oracle/userland-gate