appengine/third_party/python-adb/adb/contrib/adb_commands_safe.py - Issue 2279033003: swarming: Bump python-adb to 6e66b...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: appengine/third_party/python-adb/adb/contrib/adb_commands_safe.py

Issue 2279033003: swarming: Bump python-adb to 6e66b... (Closed) Base URL: https://github.com/luci/luci-py.git@master

Patch Set: Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: appengine/third_party/python-adb/adb/contrib/adb_commands_safe.py

diff --git a/appengine/third_party/python-adb/adb/contrib/adb_commands_safe.py b/appengine/third_party/python-adb/adb/contrib/adb_commands_safe.py

index 40ec700a03c4b0a3b62d5ded378c2759306d5045..f4c83ad767f7c54be1e7e4a6da2c51c0b7cb9c64 100644

--- a/appengine/third_party/python-adb/adb/contrib/adb_commands_safe.py

+++ b/appengine/third_party/python-adb/adb/contrib/adb_commands_safe.py

@@ -85,8 +85,7 @@ class AdbCommandsSafe(object):

_ERRORS = (

usb_exceptions.CommonUsbError,

common.usb1.USBError,

- common.usb1.USBErrorIO,

- )

+ common.usb1.USBErrorIO)

_SHELL_SUFFIX = ' ;echo -e "\n$?"'

@@ -220,7 +219,7 @@ class AdbCommandsSafe(object):

# This is an high level functionality but is needed by self.Reboot().

out = self.PullContent('/proc/uptime')

if out:

- return float(out.split()[1])

+ return float(out.split()[0])

return None

def List(self, destdir):