← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ui4/plugindiagnose.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:
ui4/plugindiagnose.py
46
46
 
47
47
 
48
48
class PluginDiagnose(QDialog, Ui_Dialog):
49
 
    def __init__(self, parent, install_mode=PLUGIN_NONE, plugin_reason=PLUGIN_REASON_NONE):
 
49
    def __init__(self, parent, install_mode=PLUGIN_NONE, plugin_reason=PLUGIN_REASON_NONE, upgrade=False):
50
50
        QDialog.__init__(self, parent)
51
51
        self.install_mode = install_mode
52
52
        self.plugin_reason = plugin_reason
54
54
        self.result = False
55
55
        self.core = CoreInstall()
56
56
        self.core.set_plugin_version()
57
 
        self.setupUi(self)
 
57
        self.setupUi(self, upgrade)
58
58
 
59
59
        self.user_settings = UserSettings()
60
60
        self.user_settings.load()
99
99
            plugin_reason = PLUGIN_REASON_NONE
100
100
            ok, sudo_ok = pkit.run_plugin_command(plugin == PLUGIN_REQUIRED, plugin_reason)
101
101
        
102
 
            if not ok or not self.core.check_for_plugin():
 
102
            if not ok or self.core.check_for_plugin() != PLUGIN_INSTALLED:
103
103
                FailureUI(self, self.__tr("Failed to install Plug-in.\nEither you have chosen to skip the Plug-in installation  or entered incorrect Password."))
104
104
 
105
105
        finally: