~ubuntu-branches/ubuntu/jaunty/system-config-printer/jaunty-proposed

diff -Nur -x '*.orig' -x '*~' system-config-printer-1.1.3+git20090218/system-config-printer.py system-config-printer-1.1.3+git20090218.new/system-config-printer.py

--- system-config-printer-1.1.3+git20090218/system-config-printer.py    2009-04-20 14:17:50.000000000 +0200

+++ system-config-printer-1.1.3+git20090218.new/system-config-printer.py        2009-04-20 14:18:24.000000000 +0200

@@ -4660,7 +4660,7 @@

         button_clicked = dialog.run()

         dialog.destroy()

         if (button_clicked == 1):

-            cmds = ("gksu -- hp-plugin -u",

+            cmds = ("if python -c 'import PyQt4.QtGui' 2>/dev/null; then gksu -- hp-plugin -u; else exit 255; fi",

                     "gksu -- xterm -T 'HPLIP Plugin Installation' -sb -rightbar -e hp-plugin -i")

             try:

                 install_result = -1

@@ -4676,10 +4676,6 @@

                         time.sleep (0.1)

                         p.poll ()

                     install_result = p.returncode

-                    for line in stderr.split ("\n"):

-                        if line.find ("PyQt not installed") >= 0:

-                            install_result = 255

-                            break

                     if install_result != 255:

                         break

                 if install_result == 0: