Mesa (master): scons: Fix git_sha1.h generation fallback.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Wed Mar 25 10:44:19 UTC 2015
Module: Mesa
Branch: master
Commit: 5db57b8a55bb1961f1ada029f63c1f07511d60aa
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5db57b8a55bb1961f1ada029f63c1f07511d60aa
Author: Jose Fonseca <jfonseca at vmware.com>
Date: Mon Mar 23 10:48:31 2015 +0000
scons: Fix git_sha1.h generation fallback.
I didn't meant to remove the 'if not os.path.exists(filename)' statement.
Reviewed-by: Brian Paul <brianp at vmware.com>
---
src/mesa/SConscript | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index a563fd2..5b80a21 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -130,9 +130,10 @@ def write_git_sha1_h_file(filename):
(commit, foo) = subprocess.Popen(args, stdout=subprocess.PIPE).communicate()
except:
# git log command didn't work
- dirname = os.path.dirname(filename)
- if not os.path.exists(dirname):
- os.makedirs(dirname)
+ if not os.path.exists(filename):
+ dirname = os.path.dirname(filename)
+ if not os.path.exists(dirname):
+ os.makedirs(dirname)
# create an empty file if none already exists
f = open(filename, "w")
f.close()
More information about the mesa-commit
mailing list