commit d735ef54dfd38f99106d5635228156139c0b57fd
author David Pursehouse <dpursehouse@collab.net> Tue Nov 05 13:30:24 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Tue Nov 05 13:30:24 2019 +0900
tree fd6e82db1845e14ae2026aea09be3fe98a8ed411
parent 9066deaedaf97c619c3de31fefae542ccfc62b7d
parent e48c6a61d5a3f9ab4589f324fc85b8e3777d8854

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  download_file.py: Fix root workspace directory detection

Change-Id: Ia4d2ff89ea3aa17683b947cb7cc74ba9dda94a7d

tools/download_file.py

diff --git a/tools/download_file.py b/tools/download_file.py
index 534a6d5..8f790be 100755
--- a/tools/download_file.py
+++ b/tools/download_file.py
@@ -84,9 +84,9 @@
 args, _ = opts.parse_args()
 
 root_dir = args.o
-while root_dir and root_dir != "/":
+while root_dir and path.dirname(root_dir) != root_dir:
   root_dir, n = path.split(root_dir)
-  if n == 'buck-out':
+  if n == 'WORKSPACE':
     break
 
 redirects = download_properties(root_dir)