← Back to branch summary

~ubuntu-branches/ubuntu/utopic/hplip/utopic-proposed

« back to all changes in this revision

Viewing changes to makecopies.py

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2012-05-26 11:20:39 UTC
  • mfrom: (1.5.6) (31.1.3 precise)
  • Revision ID: package-import@ubuntu.com-20120526112039-bevxczegxnbyr5m7
Tags: 3.12.4-1
http://bugs.debian.org/667828
http://bugs.debian.org/583273
http://bugs.debian.org/666544
* New upstream release
* Switch to source/format 3.0 (quilt) - drop dpatch
* Refreshed debian/patches
* dh_autoreconf debian/autogen.sh & set local-options single-debian-patch
* Update to debian/compat -> 9
* Fix "hardened build flags" patch from Moritz - thanks (Closes: #667828)
* Fix "duplex descriptor uninitialized" patch from Matej (Closes: #583273)
* Fix "please migrate to kde-runtime" patch from Pino (Closes: #666544)

Show diffs side-by-side

added added

removed removed

Lines of Context:
makecopies.py
283
283
                log.error(e.msg)
284
284
                sys.exit(1)
285
285
 
286
 
            scan_style = dev.mq.get('scan-style', SCAN_STYLE_FLATBED)
287
 
            log.debug(scan_style)
 
286
            scan_src = dev.mq.get('scan-src', SCAN_SRC_FLATBED)
 
287
            log.debug(scan_src)
288
288
 
289
 
            if scan_style == SCAN_STYLE_SCROLLFED:
 
289
            if scan_src == SCAN_SRC_SCROLLFED:
290
290
                fit_to_page = pml.COPIER_FIT_TO_PAGE_DISABLED
291
291
 
292
292
            log.debug("num_copies = %d" % num_copies)
296
296
            log.debug("fit_to_page = %d" % fit_to_page)
297
297
            log.debug("max_reduction = %d" % max_reduction)
298
298
            log.debug("max_enlargement = %d" % max_enlargement)
299
 
            log.debug("scan_style = %d" % scan_style)
 
299
            log.debug("scan_src = %d" % scan_src)
300
300
 
301
301
            update_queue = Queue.Queue()
302
302
            event_queue = Queue.Queue()
303
303
 
304
304
            dev.copy(num_copies, contrast, reduction,
305
 
                     quality, fit_to_page, scan_style,
 
305
                     quality, fit_to_page, scan_src,
306
306
                     update_queue, event_queue)
307
307
 
308
308