From 0ae24342fc303ed84fb922f9e8c4adfefc3ccf81 Mon Sep 17 00:00:00 2001 From: VerstreuteSeele Date: Sat, 24 Dec 2022 21:42:53 +0100 Subject: [PATCH 1/2] New Assets, cleaned up code --- fbt_options.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fbt_options.py b/fbt_options.py index a0bd4fb88..073c81e14 100644 --- a/fbt_options.py +++ b/fbt_options.py @@ -14,7 +14,7 @@ DEBUG = 0 # Suffix to add to files when building distribution # If OS environment has DIST_SUFFIX set, it will be used instead -DIST_SUFFIX = "XFW-0029_12232022" +DIST_SUFFIX = "XFW-0030_12242022" # Coprocessor firmware COPRO_OB_DATA = "scripts/ob.data" From 8140afe54f3d60e19c07be76857ed625b36b0e22 Mon Sep 17 00:00:00 2001 From: VerstreuteSeele Date: Sat, 24 Dec 2022 23:25:34 +0100 Subject: [PATCH 2/2] Update version.py --- scripts/version.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/version.py b/scripts/version.py index 76f65dcb5..c6e3320a1 100644 --- a/scripts/version.py +++ b/scripts/version.py @@ -13,7 +13,10 @@ class GitVersion: self.source_dir = source_dir def get_version_info(self): - commit = self._exec_git("rev-parse --short HEAD") or "unknown" + try: + commit = self._exec_git("rev-parse --short HEAD") + except: + commit == "Unknown" dirty = False try: