commit f2865e0c8cab99715851f84ffa298c97957fff35
author David Pursehouse <dpursehouse@collab.net> Wed Nov 06 15:22:54 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Wed Nov 06 15:22:54 2019 +0900
tree 87b3d0be7e5def32416008705dfeef67637ca36c
parent e1360b49f90930e280f6a43380ab533705c85446
parent d735ef54dfd38f99106d5635228156139c0b57fd

Merge branch 'stable-2.15' into stable-2.16

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

Change-Id: Ib8e0bb051d97010497e0d7b9184537a0dc52662a

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)