projects / packages / hplip.git / blame
| Commit | Line | Data |
|---|---|---|
| b06f652b SS |
1 | --- hplip-1.7.2/base/utils.py.ui-optional 2007-02-07 19:21:31.000000000 +0000 |
| 2 | +++ hplip-1.7.2/base/utils.py 2007-06-11 14:29:16.000000000 +0100 | |
| 3 | @@ -644,6 +644,13 @@ | |
| 4 | log.error("PyQt not installed. GUI not available. Exiting.") | |
| 5 | return False | |
| 6 | ||
| 7 | + # hplip-gui sub-package (Fedora) | |
| 8 | + try: | |
| 9 | + import ui | |
| 10 | + except ImportError: | |
| 11 | + log.error("hplip-gui not installed. GUI not available. Exiting.") | |
| 12 | + return False | |
| 13 | + | |
| 14 | # check version of Qt | |
| 15 | qtMajor = int(qt.qVersion().split('.')[0]) | |
| 16 | ||
| 4ce067c2 SS |
17 | --- hplip-2.7.10/unload.py.orig 2007-11-16 14:18:34.263284703 +0100 |
| 18 | +++ hplip-2.7.10/unload.py 2007-11-16 14:20:46.243150346 +0100 | |
| 19 | @@ -702,17 +702,16 @@ | |
| 20 | ||
| 21 | if mode == GUI_MODE: | |
| 22 | if not prop.gui_build: | |
| 23 | - log.error("GUI mode disabled in build. Exiting.") | |
| 24 | - sys.exit(1) | |
| 25 | + log.warn("GUI mode disabled in build. Reverting to non-interactive mode.") | |
| 26 | + mode = NON_INTERACTIVE_MODE | |
| 27 | ||
| 28 | elif not os.getenv('DISPLAY'): | |
| 29 | - log.error("No display found. Exiting.") | |
| 30 | - sys.exit(1) | |
| 31 | + log.warn("No display found. Reverting to non-interactive mode.") | |
| 32 | + mode = NON_INTERACTIVE_MODE | |
| 33 | ||
| 34 | elif not utils.checkPyQtImport(): | |
| 35 | - log.error("PyQt init failed. Exiting.") | |
| 36 | - sys.exit(1) | |
| 37 | - | |
| 38 | + log.warn("PyQt init failed. Reverting to non-interactive mode.") | |
| 39 | + mode = NON_INTERACTIVE_MODE | |
| 40 | ||
| 41 | if mode == GUI_MODE: | |
| 42 | if not os.getenv('DISPLAY'): | |
| 43 | --- hplip-2.7.10/makecopies.py.orig 2007-11-16 14:21:42.234608500 +0100 | |
| 44 | +++ hplip-2.7.10/makecopies.py 2007-11-16 14:22:44.225151454 +0100 | |
| 45 | @@ -391,8 +391,9 @@ | |
| 46 | log.debug("reduction = %d" % reduction) | |
| 47 | log.debug("quality = %d" % quality) | |
| 48 | log.debug("fit_to_page = %d" % fit_to_page) | |
| 49 | - log.debug("max_reduction = %d" % max_reduction) | |
| 50 | - log.debug("max_enlargement = %d" % max_enlargement) | |
| 51 | +# it fails if max_reduction is undefined | |
| 52 | +# log.debug("max_reduction = %d" % max_reduction) | |
| 53 | +# log.debug("max_enlargement = %d" % max_enlargement) | |
| 54 | log.debug("scan_style = %d" % scan_style) | |
| 55 | ||
| 56 | update_queue = Queue.Queue() |