diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org> | 2014-10-09 10:53:02 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org> | 2014-10-09 10:53:02 +0000 |
| commit | 1bada4840136a8ecd157ccaf8117b53d530298a7 (patch) | |
| tree | 99a2f39cccfa4df1c534e29ff7a7d7cf14f8760f /DEPS | |
| parent | 2c0cdbce226137a8f755ae0fb51c28a335b2ea5d (diff) | |
| download | webrtc-1bada4840136a8ecd157ccaf8117b53d530298a7.tar.gz | |
Make DEPS find check_root_dir.py in legacy checkouts.
In r7405 the DEPS hook wasn't properly handling the case
when the trunk dir is not yet renamed. This makes the script
only be called if it exists in the old not-yet-renamed trunk dir.
BUG=3534
R=phoglund@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/31639004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7408 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -55,7 +55,11 @@ hooks = [ # Check for legacy named top-level dir (named 'trunk'). "name": "check_root_dir_name", "pattern": ".", - "action": ["python", "-u", "src/check_root_dir.py"], + "action": ["python","-c", + ("import os, sys;" + "script = os.path.join('trunk', 'check_root_dir.py');" + "_ = os.system('%s %s' % (sys.executable, script)) " + "if os.path.exists(script) else 0")], }, { # Clone chromium and its deps. |