Permalink
Browse files

Show display name within list cloud printer script

  • Loading branch information...
simoncadman committed Oct 8, 2013
1 parent d6beac3 commit 0f576cf22a15624db980f239014e4ee66f4eb41a
Showing with 12 additions and 9 deletions.
  1. +1 −1 backend.py
  2. +1 −1 deleteaccount.py
  3. +1 −1 dynamicppd.py
  4. +5 −2 listcloudprinters.py
  5. +1 −1 reportissues.py
  6. +1 −1 setupcloudprint.py
  7. +1 −1 submitjob.py
  8. +1 −1 upgrade.py
View
@@ -20,7 +20,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131006 200957"
+ CCPVersion = "20131008 210502"
print "CUPS Cloud Print CUPS Backend Version " + CCPVersion
sys.exit(0)
View
@@ -20,7 +20,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131006 200957"
+ CCPVersion = "20131008 210502"
print "CUPS Cloud Print Delete Account Script Version " + CCPVersion
sys.exit(0)
View
@@ -19,7 +19,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131006 200957"
+ CCPVersion = "20131008 210502"
print "CUPS Cloud Print Dynamic PPD Generator Version " + CCPVersion
sys.exit(0)
View
@@ -21,7 +21,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131006 200957"
+ CCPVersion = "20131008 210502"
print "CUPS Cloud Print Printer Lister Version " + CCPVersion
sys.exit(0)
@@ -33,4 +33,7 @@
sys.exit(1)
for foundprinter in printers:
- print(foundprinter['name'].encode('ascii', 'replace') + ' - ' + printer.printerNameToUri(foundprinter['account'], foundprinter['name'].encode('ascii', 'replace')) + " - " + foundprinter['account'])
+ printerName = foundprinter['name']
+ if 'displayName' in foundprinter:
+ printerName = foundprinter['displayName']
+ print(printerName.encode('ascii', 'replace') + ' - ' + printer.printerNameToUri(foundprinter['account'], foundprinter['name'].encode('ascii', 'replace')) + " - " + foundprinter['account'])
View
@@ -19,7 +19,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131006 200957"
+ CCPVersion = "20131008 210502"
print "CUPS Cloud Print Issue Reporting Script Version " + CCPVersion
sys.exit(0)
View
@@ -21,7 +21,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131006 200957"
+ CCPVersion = "20131008 210502"
print "CUPS Cloud Print Setup Script Version " + CCPVersion
sys.exit(0)
View
@@ -21,7 +21,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131006 200957"
+ CCPVersion = "20131008 210502"
print "CUPS Cloud Print Submit Job Version " + CCPVersion
sys.exit(0)
View
@@ -22,7 +22,7 @@
if len(sys.argv) == 2 and sys.argv[1] == 'version':
# line below is replaced on commit
- CCPVersion = "20131006 200957"
+ CCPVersion = "20131008 210502"
print "CUPS Cloud Print Upgrade Script Version " + CCPVersion
sys.exit(0)

0 comments on commit 0f576cf

Please sign in to comment.