Backed out changeset 1a48edb857f3 (bug 1410723) for autophone mass failures r=backout on a CLOSED TREE

testing/mozbase/mozdevice/mozdevice/devicemanagerADB.py

@@ -540,17 +540,14 @@ class DeviceManagerADB(DeviceManager):
                 localDir = '/'.join(localDir.rstrip('/').split('/')[:-1])
         cmd = ["pull", remoteDir, localDir]
         proc = self._runCmd(cmd)
-        if proc.returncode != 0:
-            # Raise a DMError when the device is missing, but not when the
-            # directory is empty or missing.
-            if ("no devices/emulators found" in proc.output or
-                ("pulled" not in proc.output and
-                 "does not exist" not in proc.output)):
-                raise DMError("getDirectory() failed to pull %s: %s" %
-                              (remoteDir, proc.output))
         if copyRequired:
-            dir_util.copy_tree(localDir, originalLocal)
-            mozfile.remove(tempParent)
+            try:
+                dir_util.copy_tree(localDir, originalLocal)
+                mozfile.remove(tempParent)
+            except:
+                self._logger.error("getDirectory() failed after %s" % str(cmd))
+                self._logger.error("rc=%d out=%s" % (proc.returncode, str(proc.output)))
+                raise
 
     def validateFile(self, remoteFile, localFile):
         md5Remote = self._getRemoteHash(remoteFile)