diff options
| author | Gary Murakami <gary.murakami@10gen.com> | 2012-08-03 14:48:28 -0400 |
|---|---|---|
| committer | Matt Kangas <matt.kangas@10gen.com> | 2013-06-11 17:47:02 -0400 |
| commit | 42255e2d5a9fa8eff2426d78be3e292f45a39cbc (patch) | |
| tree | 94330b956d4ed50927b42c33428fce0035c5fcad /buildscripts/utils.py | |
| parent | ec882b844512f7bdc8172fedce5ddad73557cc3e (diff) | |
| download | mongo-42255e2d5a9fa8eff2426d78be3e292f45a39cbc.tar.gz | |
SERVER-9486 git submodule scons build issue fix
If you add mongo to a parent project via "git submodule add", you need these fixes to build mongo.
Signed-off-by: Matt Kangas <matt.kangas@10gen.com>
Diffstat (limited to 'buildscripts/utils.py')
| -rw-r--r-- | buildscripts/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/buildscripts/utils.py b/buildscripts/utils.py index fe35f69eec3..a30b9576b76 100644 --- a/buildscripts/utils.py +++ b/buildscripts/utils.py @@ -36,7 +36,7 @@ def getAllSourceFiles( arr=None , prefix="." ): def getGitBranch(): - if not os.path.exists( ".git" ): + if not os.path.exists( ".git" ) or not os.path.isdir(".git"): return None version = open( ".git/HEAD" ,'r' ).read().strip() @@ -63,7 +63,7 @@ def getGitBranchString( prefix="" , postfix="" ): return prefix + b + postfix def getGitVersion(): - if not os.path.exists( ".git" ): + if not os.path.exists( ".git" ) or not os.path.isdir(".git"): return "nogitversion" version = open( ".git/HEAD" ,'r' ).read().strip() |