From 6367fe885a3ab6704b5eb066dadf98713ccc5d88 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Fri, 7 Jun 2013 15:43:04 +0000 Subject: [PATCH] Fix relative path to .gitignore and other minor changes. R=kjellander@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1624005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4195 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/build/extra_gitignore.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webrtc/build/extra_gitignore.py b/webrtc/build/extra_gitignore.py index 423ad174e..f8496686b 100755 --- a/webrtc/build/extra_gitignore.py +++ b/webrtc/build/extra_gitignore.py @@ -20,15 +20,18 @@ import sys MODIFY_STRING = '# The following added by %s\n' + def main(argv): if not argv[1]: # Special case; do nothing. return 0 - modify_string = (MODIFY_STRING % argv[0]) - gitignore_file = os.path.dirname(argv[0]) + '/../.gitignore' + modify_string = MODIFY_STRING % argv[0] + gitignore_file = os.path.dirname(argv[0]) + '/../../.gitignore' lines = open(gitignore_file, 'r').readlines() for i, line in enumerate(lines): + # Look for modify_string in the file to ensure we don't append the extra + # patterns more than once. if line == modify_string: lines = lines[:i] break