зеркало из https://github.com/mozilla/pjs.git
Bug 731403 - Update dmADB.getDirectory to use stdout instead of stderr. r=wlach
This commit is contained in:
Родитель
0914040610
Коммит
1585192ba5
|
@ -449,8 +449,8 @@ class DeviceManagerADB(DeviceManager):
|
|||
def getDirectory(self, remoteDir, localDir, checkDir=True):
|
||||
ret = []
|
||||
p = self.runCmd(["pull", remoteDir, localDir])
|
||||
p.stderr.readline()
|
||||
line = p.stderr.readline()
|
||||
p.stdout.readline()
|
||||
line = p.stdout.readline()
|
||||
while (line):
|
||||
els = line.split()
|
||||
f = els[len(els) - 1]
|
||||
|
@ -463,7 +463,7 @@ class DeviceManagerADB(DeviceManager):
|
|||
if (i > 0):
|
||||
f = f[0:i]
|
||||
ret.append(f)
|
||||
line = p.stderr.readline()
|
||||
line = p.stdout.readline()
|
||||
#the last line is a summary
|
||||
if (len(ret) > 0):
|
||||
ret.pop()
|
||||
|
|
Загрузка…
Ссылка в новой задаче