зеркало из https://github.com/mozilla/gecko-dev.git
Bug 722297 - DeviceManagerADB: Several launchProcess problems. r=gbrown
[PATCH 8/9] Strip trailing line endings from listFiles output From 7002d4b57d5f829fe25a4098c3d7a1ff869a281e Mon Sep 17 00:00:00 2001 Message-Id: <7002d4b57d5f829fe25a4098c3d7a1ff869a281e.1327949409.git.choller@mozilla.com> In-Reply-To: <8149860494be47c731b377e42c4cf88c97cf8bae.1327949409.git.choller@mozilla.com> References: <8149860494be47c731b377e42c4cf88c97cf8bae.1327949409.git.choller@mozilla.com> --- build/mobile/devicemanagerADB.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
This commit is contained in:
Родитель
5a041404ef
Коммит
acd7c82e00
|
@ -237,6 +237,7 @@ class DeviceManagerADB(DeviceManager):
|
||||||
def listFiles(self, rootdir):
|
def listFiles(self, rootdir):
|
||||||
p = self.runCmd(["shell", "ls", "-a", rootdir])
|
p = self.runCmd(["shell", "ls", "-a", rootdir])
|
||||||
data = p.stdout.readlines()
|
data = p.stdout.readlines()
|
||||||
|
data[:] = [item.rstrip('\r\n') for item in data]
|
||||||
if (len(data) == 1):
|
if (len(data) == 1):
|
||||||
if (data[0] == rootdir):
|
if (data[0] == rootdir):
|
||||||
return []
|
return []
|
||||||
|
|
Загрузка…
Ссылка в новой задаче