AdbClient: Added more verbose message for version check

dtmilano · dtmilano · commit 6ac2db5b1ec9 · 2013-09-11T09:53:55.000-04:00
- Version 4.2.2
- Corrected usage in example script
diff --git a/AndroidViewClient/examples/screenshot-monkeyrunner.py b/AndroidViewClient/examples/screenshot-monkeyrunner.py
@@ -13,7 +13,7 @@
 from com.android.monkeyrunner import MonkeyRunner, MonkeyDevice
 
 if len(sys.argv) < 2:
-    print >> sys.stderr, "usage: %s filename.png [serialno]" % sys.argv[0]
+    print >> sys.stderr, "usage: %s filename.png" % sys.argv[0]
     sys.exit(1)
 
 filename = sys.argv.pop(1)
diff --git a/AndroidViewClient/src/com/dtmilano/android/adb/adbclient.py b/AndroidViewClient/src/com/dtmilano/android/adb/adbclient.py
@@ -17,7 +17,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '4.2.0'
+__version__ = '4.2.2'
 
 import sys
 import socket
@@ -177,8 +177,9 @@ def checkVersion(self, reconnect=True):
             print >> sys.stderr, "checkVersion(reconnect=%s)" % reconnect
         self.__send('host:version', reconnect=False)
         version = self.socket.recv(8)
-        if version != '0004001f':
-            raise RuntimeError("ERROR: Incorrect version %s" % (version))
+        VERSION='0004001f'
+        if version != VERSION:
+            raise RuntimeError("ERROR: Incorrect ADB server version %s (expecting %s)" % (version, VERSION))
         if reconnect:
             self.__connect()
         
@@ -368,4 +369,4 @@ def wake(self):
     
         print "\nBye"
     else:
-        print 'date:', adbClient.shell('date')
+        print 'date:', adbClient.shell('date')
