Fix merge issues

This commit is contained in:
MX 2023-05-09 20:24:43 +03:00
parent 02a22086a1
commit 1d2d05cfdf
No known key found for this signature in database
GPG key ID: 7CCC66B7DBDD1C83

View file

@ -35,8 +35,6 @@ class GitVersion:
or "unknown"
)
branch_num = self._exec_git("rev-list --count HEAD") or "n/a"
version = (
os.environ.get("DIST_SUFFIX", None)
or "unknown"
@ -58,7 +56,6 @@ class GitVersion:
return {
"GIT_COMMIT": commit,
"GIT_BRANCH": branch,
"GIT_BRANCH_NUM": branch_num,
"FURI_CUSTOM_FLIPPER_NAME": custom_fz_name,
"VERSION": version,
"BUILD_DIRTY": dirty and 1 or 0,
@ -67,7 +64,6 @@ class GitVersion:
return {
"GIT_COMMIT": commit,
"GIT_BRANCH": branch,
"GIT_BRANCH_NUM": branch_num,
"VERSION": version,
"BUILD_DIRTY": dirty and 1 or 0,
}