git_sha1_gen: catch any error the same way
authorEric Engestrom <eric.engestrom@imgtec.com>
Wed, 2 Aug 2017 13:57:52 +0000 (14:57 +0100)
committerEric Engestrom <eric.engestrom@imgtec.com>
Wed, 2 Aug 2017 13:57:54 +0000 (14:57 +0100)
Acked-by: Jose Fonseca <jfonseca@vmware.com>
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
bin/git_sha1_gen.py

index fe30084a4f87dfd7439bb608ed79ff343f47515a..e26d3a3f76478973a6593b84b6b88d7cf241f4ab 100755 (executable)
@@ -13,11 +13,8 @@ try:
         '--short=10',
         'HEAD',
     ], stderr=open(os.devnull, 'w'))
-except subprocess.CalledProcessError as e:
-    # don't print anything if git fails
-    pass
-except OSError as eos:
-    # don't fail on inaccessible files when sandboxed
+except:
+    # don't print anything if it fails
     pass
 else:
     sys.stdout.write('#define MESA_GIT_SHA1 "git-%s"\n' % git_sha1.rstrip())