| Index: appengine/swarming/server/bot_archive.py
|
| diff --git a/appengine/swarming/server/bot_archive.py b/appengine/swarming/server/bot_archive.py
|
| index 42c4675865f5c8f79d6095ce6a803f32c6341925..232fcd6a1659efb22158a113be4467030dc589d5 100755
|
| --- a/appengine/swarming/server/bot_archive.py
|
| +++ b/appengine/swarming/server/bot_archive.py
|
| @@ -156,6 +156,18 @@ FILES = (
|
| 'utils/tools.py',
|
| 'utils/zip_package.py',
|
| 'xsrf_client.py',
|
| +
|
| + # TODO(maruel): Find a way to only include these on linux platforms but it's
|
| + # not that large so it is not a big deal.
|
| + 'adb/__init__.py',
|
| + 'adb/adb_commands.py',
|
| + 'adb/adb_protocol.py',
|
| + 'adb/common.py',
|
| + 'adb/fastboot.py',
|
| + 'adb/filesync_protocol.py',
|
| + 'adb/usb_exceptions.py',
|
| + 'libusb1.py',
|
| + 'usb1.py',
|
| )
|
|
|
| def resolve_symlink(path):
|
| @@ -165,6 +177,9 @@ def resolve_symlink(path):
|
| git on Windows renders symlinks as normal files.
|
| """
|
| if sys.platform != 'win32' or os.path.isfile(path):
|
| + # This means that symlinks to file will not be resolved properly. In our
|
| + # case this is fine because the only 2 instances of this issue are
|
| + # libusb1.py and usb1.py, which are only used on Ubuntu.
|
| return path
|
| parts = os.path.normpath(path).split(os.path.sep)
|
| for i in xrange(2, len(parts)):
|
|
|