← Back to branch summary

~ubuntu-branches/ubuntu/raring/hplip/raring-proposed

« back to all changes in this revision

Viewing changes to check-plugin.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:
check-plugin.py
90
90
 
91
91
        if ps_plugin is False and ps_diagnose_plugin is False:            
92
92
            Plugin_Installation_Completed = True
93
 
            if core.check_for_plugin() is True:
 
93
            if core.check_for_plugin() == PLUGIN_INSTALLED:
94
94
                break
95
95
            else:
96
96
                log.error("Failed to download firmware required files. manually run hp-plugin command in terminal fisrt")
277
277
 
278
278
core = core_install.CoreInstall()
279
279
core.set_plugin_version()
280
 
if core.check_for_plugin():
 
280
plugin_sts = core.check_for_plugin()
 
281
if plugin_sts == PLUGIN_INSTALLED:
281
282
    log.info("Device Plugin is already installed")
282
283
    Is_Plugin_Already_Installed = True
 
284
elif plugin_sts == PLUGIN_VERSION_MISMATCH:
 
285
    log.info("HP Device Plug-in version mismatch or some files are corrupted")
283
286
else:
284
 
    log.info("Device Plugin is not found")
 
287
    log.info("HP Device Plug-in is not found.")
285
288
 
286
289
if Systray_Msg_Enabled:
287
290
    if not Is_Plugin_Already_Installed: