abdullah/adb-sync
1
0
Fork 0
mirror of https://github.com/google/adb-sync.git synced 2026-01-04 10:28:01 +00:00
Code Issues Releases Wiki Activity

Fix some accidental Unicode/Binary string mistakes from b28ba49.

Browse Source
This commit is contained in:
Rudolf Polzer
2016-07-08 20:13:19 -04:00
parent 9a0d978900
commit 7fc48ad1e1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
adb-sync
View File

@@ -226,7 +226,7 @@ class AdbFileSystem(object):
with self.Stdout(self.adb + [b'shell', _sprintf(b'ls -al %s', with self.Stdout(self.adb + [b'shell', _sprintf(b'ls -al %s',
self.QuoteArgument(path + b'/'))]) as stdout: self.QuoteArgument(path + b'/'))]) as stdout:
for line in stdout: for line in stdout:
if line.startswith('total '): if line.startswith(b'total '):
continue continue
line = line.rstrip(b'\r\n') line = line.rstrip(b'\r\n')
try: try:
@@ -245,7 +245,7 @@ class AdbFileSystem(object):
with self.Stdout(self.adb + [b'shell', _sprintf(b'ls -ald %s', with self.Stdout(self.adb + [b'shell', _sprintf(b'ls -ald %s',
self.QuoteArgument(path))]) as stdout: self.QuoteArgument(path))]) as stdout:
for line in stdout: for line in stdout:
if line.startswith('total '): if line.startswith(b'total '):
continue continue
line = line.rstrip(b'\r\n') line = line.rstrip(b'\r\n')
statdata, filename = self.LsToStat(line) statdata, filename = self.LsToStat(line)
@@ -331,7 +331,7 @@ def BuildFileList(fs, path, prefix=b''):
_print(b'Warning: could not cache lstat for %s', path) _print(b'Warning: could not cache lstat for %s', path)
files.sort() files.sort()
for n in files: for n in files:
if n == '.' or n == '..': if n == b'.' or n == b'..':
continue continue
for t in BuildFileList(fs, path + b'/' + n, prefix + b'/' + n): for t in BuildFileList(fs, path + b'/' + n, prefix + b'/' + n):
yield t yield t