Merge lp:~sergiusens/phablet-tools/1228129 into lp:phablet-tools

[Sergio Schvezov]

phablet-flash: Adding a friendly error message when device detection fails

Adding a friendly error message when device detection fails

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:212
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/226/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-amd64-ci/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-armhf-ci/169
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-saucy-i386-ci/170

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/phablet-tools-ci/226/rebuild

review: Approve (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

It doesn't seem to use the formatting you have in your lines 19-22, but just one long string, which is quite hard to read when words like "operating" split over two lines on a standard size gnome terminal

alan@deep-thought:/tmp/1228129$ ./phablet-flash cdimage-touch
error: device not found
ERROR:phablet-flash:Device either not connected, doesn't have adb enabled or the property system cannot be accessed. Make sure the device is booted into the operating system and that adb is working correctly.

[Alan Pope 🍺🐧🐱 🦄 (popey)]

review: Approve

=== modified file 'phabletutils/environment.py'
--- phabletutils/environment.py	2013-10-15 19:30:43 +0000
+++ phabletutils/environment.py	2013-10-22 19:43:07 +0000
@@ -29,10 +29,25 @@
 from phabletutils import projects
 from phabletutils import settings
 from phabletutils import ubuntuimage
+from subprocess import CalledProcessError
 
 log = logging.getLogger()
 
 
+def device_friendly_error_message(f):
+    def wrapper(*args, **kwargs):
+        try:
+            return f(*args, **kwargs)
+        except CalledProcessError:
+            raise EnvironmentError(
+                'Device either not connected, doesn\'t have adb enabled '
+                'or the property system cannot be accessed. Make sure the '
+                'device is booted into the operating system and that adb '
+                'is working correctly.')
+    return wrapper
+
+
+@device_friendly_error_message
 def detect_device(serial, device=None):
     '''If no argument passed determine them from the connected device.'''
     # Check CyanogenMod property