zlib: fix mapfile
[oi-userland.git] / components / print / hal-cups-utils / patches / 00-hal_lpadmin.patch
blobdd82fc1e897db869c97257e60d7967734b76c13d
1 --- systemv/hal_lpadmin.orig Tue Apr 14 22:13:11 2009
2 +++ systemv/hal_lpadmin Tue Apr 14 22:13:21 2009
3 @@ -283,7 +284,8 @@
4 uris=["hal://%s" % self.uid]
5 if self.properties.has_key("printer.vendor"):
6 vendor = self.properties["printer.vendor"].lower ()
7 - if (self.properties.get("linux.subsystem","") == "usb" and
8 + if ((self.properties.get("linux.subsystem","") == "usb" or
9 + self.properties.get("info.solaris.driver","") == "usbprn") and
10 self.properties.has_key("printer.product")):
11 # Use a 'usb:...' URI. Use the same method the CUPS
12 # usb backend uses to construct it.
13 @@ -609,6 +611,9 @@
14 resg = res.groups()
15 serial = resg[0]
16 bus = self.properties.get ("linux.subsystem", None)
17 + if ((bus == None) and
18 + (self.properties.get("info.solaris.driver", None) == 'usbprn')):
19 + bus = 'usb'
20 udi = self.properties.get ("info.udi", None)
21 if make:
22 makel = make.lower ()