commit 4bf203c241084ad26b6eaaa62cc71945f4c81540
author David Pursehouse <dpursehouse@collab.net> Fri Nov 08 13:43:04 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Fri Nov 08 13:43:04 2019 +0900
tree 50e993da35e0103118f942a053ec11eda533abd7
parent cf5be217dc024c5e1a001ff24441bef7ac2d90d0
parent 2118fd30e24f339f5daf5310144dcb7a9123bc90

Merge branch 'stable-3.0'

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

Change-Id: Ifa50eeb0db405fdf0fcfacc22e6c5466ae3983dd

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)