Bug 1524150 - [mozdevice] remove -s <serialno> from ADBProcess-based error messages, r=gbrown.

testing/mozbase/mozdevice/mozdevice/adb.py

@@ -46,8 +46,12 @@ class ADBProcess(object):
         return content
 
     def __str__(self):
+        # Remove -s <serialno> from the error message to allow bug suggestions
+        # to be independent of the individual failing device.
+        arg_string = ' '.join(self.args)
+        arg_string = re.sub(' -s \w+', '', arg_string)
         return ('args: %s, exitcode: %s, stdout: %s' % (
-            ' '.join(self.args), self.exitcode, self.stdout))
+            arg_string, self.exitcode, self.stdout))
 
 # ADBError, ADBRootError, and ADBTimeoutError are treated
 # differently in order that unhandled ADBRootErrors and

testing/mozbase/mozdevice/setup.py

@@ -8,7 +8,7 @@ from __future__ import absolute_import
 from setuptools import setup
 
 PACKAGE_NAME = 'mozdevice'
-PACKAGE_VERSION = '2.0'
+PACKAGE_VERSION = '2.0.1'
 
 deps = ['mozlog >= 3.0']