From aab06494873bd9f46e8db960ea1f889701d43400 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric.engestrom@imgtec.com>
Date: Wed, 2 Aug 2017 14:57:52 +0100
Subject: [PATCH] git_sha1_gen: catch any error the same way

Acked-by: Jose Fonseca <jfonseca@vmware.com>
Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
---
 bin/git_sha1_gen.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/bin/git_sha1_gen.py b/bin/git_sha1_gen.py
index fe30084a4f8..e26d3a3f764 100755
--- a/bin/git_sha1_gen.py
+++ b/bin/git_sha1_gen.py
@@ -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())
-- 
2.30.2