← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/hplip/gutsy-security

« back to all changes in this revision

Viewing changes to clean.py

  • Committer: Bazaar Package Importer
  • Author(s): Till Kamppeter
  • Date: 2006-09-15 18:00:07 UTC
  • mfrom: (1.2.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20060915180007-96mez3nck3oy5wij
Tags: 1.6.7-2ubuntu1
* Merge from debian unstable.
* Removed patches 50_ui-supportform-cleanups.dpatch and
  55_ui-supportform-debian.dpatch, there is no support window in the HP
  toolbox any more.
* HPLIP (file io/hpiod/usbext.h) includes linux/compiler.h which is not
  part of Ubuntu Linux and not needed. Removed the include with patch
  80_no-compiler.h.dpatch.
* debian/control: Let the "Conflicts:" of hpijs-ppds be only a "Breaks:"
  to facilitate an update from the previous version when both hpijs and
  hpijs-ppds are installed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
clean.py
21
21
#
22
22
 
23
23
 
24
 
__version__ = '1.6'
 
24
__version__ = '1.7'
25
25
__title__ = 'Printer Cartridge Cleaning Utility'
26
26
__doc__ = "Cartridge cleaning utility for HPLIP supported inkjet printers."
27
27
 
65
65
    utils.format_text(USAGE, typ, __title__, 'hp-clean', __version__)
66
66
    sys.exit(0)
67
67
 
 
68
log.set_module("hp-clean")
68
69
 
69
70
try:
70
71
    opts, args = getopt.getopt(sys.argv[1:], 'p:d:hl:b:v:g',
107
108
 
108
109
    elif o in ('-l', '--logging'):
109
110
        log_level = a.lower().strip()
 
111
        if not log.set_level(log_level):
 
112
            usage()
110
113
        
111
114
    elif o == '-g':
112
115
        log.set_level('debug')
126
129
if not device.validateBusList(bus):
127
130
    usage()
128
131
 
129
 
if not log.set_level(log_level):
130
 
    usage()
131
 
 
132
132
if device_uri and printer_name:
133
133
    log.error("You may not specify both a printer (-p) and a device (-d).")
134
134
    usage()