| 1 | --- ./check.py.orig 2014-03-10 14:46:40.000000000 +0100 |
|---|
| 2 | +++ ./check.py 2014-03-10 14:56:40.000000000 +0100 |
|---|
| 3 | @@ -142,9 +142,9 @@ |
|---|
| 4 | comment = "Python Programming is not supported if version is lessthan 2.2" |
|---|
| 5 | elif package == 'hpaio': |
|---|
| 6 | if Inst_status == 'OK': |
|---|
| 7 | - comment = "'hpaio found in /etc/sane.d/dll.conf'" |
|---|
| 8 | + comment = "'hpaio found in @PREFIX@/etc/sane.d/dll.conf'" |
|---|
| 9 | else: |
|---|
| 10 | - comment = "'hpaio not found in /etc/sane.d/dll.conf. hpaio needs to be added in this file.'" |
|---|
| 11 | + comment = "'hpaio not found in @PREFIX@/etc/sane.d/dll.conf. hpaio needs to be added in this file.'" |
|---|
| 12 | elif package == 'cupsext' or package == 'pcardext' or package == 'hpmudext': |
|---|
| 13 | if Inst_status != 'OK': |
|---|
| 14 | comment = "'Not Found or Failed to load, Please reinstall HPLIP'" |
|---|
| 15 | @@ -310,9 +310,9 @@ |
|---|
| 16 | %(self.distro_name, self.distro_version, self.distro_name, supported_distro_vrs))) |
|---|
| 17 | |
|---|
| 18 | tui.header("SYSTEM INFO") |
|---|
| 19 | - Sts, Kernel_info =utils.run("uname -r -v -o") |
|---|
| 20 | + Sts, Kernel_info =utils.run("uname -r -v -s") |
|---|
| 21 | Sts, Host_info =utils.run("uname -n") |
|---|
| 22 | - Sts, Proc_info =utils.run("uname -r -v -o") |
|---|
| 23 | + Sts, Proc_info =utils.run("uname -r -v -s") |
|---|
| 24 | log.info(" Kernel: %s Host: %s Proc: %s Distribution: %s %s"\ |
|---|
| 25 | %(Kernel_info,Host_info,Proc_info,self.distro_name, self.distro_version)) |
|---|
| 26 | log.info(" Bitness: %s bit\n"%utils.getBitness()) |
|---|
| 27 | @@ -328,9 +328,9 @@ |
|---|
| 28 | log.warn("HPLIP-Installation: Auto installation is not supported for %s distro %s version " %(self.distro_name, self.distro_version)) |
|---|
| 29 | |
|---|
| 30 | log.info() |
|---|
| 31 | - log.info(log.bold("Current contents of '/etc/hp/hplip.conf' file:")) |
|---|
| 32 | + log.info(log.bold("Current contents of '@PREFIX@/etc/hp/hplip.conf' file:")) |
|---|
| 33 | try: |
|---|
| 34 | - output = file('/etc/hp/hplip.conf', 'r').read() |
|---|
| 35 | + output = file('@PREFIX@/etc/hp/hplip.conf', 'r').read() |
|---|
| 36 | except (IOError, OSError), e: |
|---|
| 37 | log.error("Could not access file: %s. Check HPLIP installation." % e.strerror) |
|---|
| 38 | self.num_errors += 1 |
|---|
| 39 | @@ -338,9 +338,9 @@ |
|---|
| 40 | log.info(output) |
|---|
| 41 | |
|---|
| 42 | log.info() |
|---|
| 43 | - log.info(log.bold("Current contents of '/var/lib/hp/hplip.state' file:")) |
|---|
| 44 | + log.info(log.bold("Current contents of '@PREFIX@/var/lib/hp/hplip.state' file:")) |
|---|
| 45 | try: |
|---|
| 46 | - output = file(os.path.expanduser('/var/lib/hp/hplip.state'), 'r').read() |
|---|
| 47 | + output = file(os.path.expanduser('@PREFIX@/var/lib/hp/hplip.state'), 'r').read() |
|---|
| 48 | except (IOError, OSError), e: |
|---|
| 49 | log.info("Plugins are not installed. Could not access file: %s" % e.strerror) |
|---|
| 50 | else: |
|---|
| 51 | @@ -442,9 +442,10 @@ |
|---|
| 52 | tui.header("DISCOVERED SCANNER DEVICES") |
|---|
| 53 | if utils.which('scanimage'): |
|---|
| 54 | status, output = utils.run("scanimage -L") |
|---|
| 55 | - if status != 0 : |
|---|
| 56 | - log.error("Failed to get Scanners information.") |
|---|
| 57 | - elif 'No scanners were identified' in output: |
|---|
| 58 | +# if status != 0 : |
|---|
| 59 | +# log.error("Failed to get Scanners information.") |
|---|
| 60 | +# elif 'No scanners were identified' in output: |
|---|
| 61 | + if 'No scanners were identified' in output: |
|---|
| 62 | log.info("No Scanner found.") |
|---|
| 63 | else: |
|---|
| 64 | log.info(output) |
|---|
