Bug 1417006 - remove tombstone files but keep the directory. r=dminor
authorJohn Lin <jolin@mozilla.com>
Mon, 13 Nov 2017 16:10:35 +0800
changeset 436406 49a49d8486d5950b50c7812bfe13af1979d7608e
parent 436405 c9117e83e3a25d9e67d326147699f7e6946f0eda
child 436407 feaa174ea9448c26853df32be2287c95e7e66c5b
push id117
push userfmarier@mozilla.com
push dateTue, 28 Nov 2017 20:17:16 +0000
reviewersdminor
bugs1417006
milestone59.0a1
Bug 1417006 - remove tombstone files but keep the directory. r=dminor MozReview-Commit-ID: Ds87KZ47vf1
build/mobile/remoteautomation.py
--- a/build/mobile/remoteautomation.py
+++ b/build/mobile/remoteautomation.py
@@ -160,19 +160,19 @@ class RemoteAutomation(Automation):
                 print "Error pulling %s" % traces
             except IOError:
                 print "Error pulling %s" % traces
         else:
             print "%s not found" % traces
 
     def deleteTombstones(self):
         # delete any existing tombstone files from device
-        remoteDir = "/data/tombstones"
+        tombstones = "/data/tombstones/*"
         try:
-            self._devicemanager.shellCheckOutput(['rm', '-r', remoteDir], root=True,
+            self._devicemanager.shellCheckOutput(['rm', '-r', tombstones], root=True,
                                                  timeout=DeviceManager.short_timeout)
         except DMError:
             # This may just indicate that the tombstone directory is missing
             pass
 
     def checkForTombstones(self):
         # pull any tombstones from device and move to MOZ_UPLOAD_DIR
         remoteDir = "/data/tombstones"