projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ee988a6
)
Make sure version.py runs succesfully even if git is not installed.
author
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 1 Apr 2022 10:46:11 +0000
(12:46 +0200)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Fri, 1 Apr 2022 10:46:11 +0000
(12:46 +0200)
version.py
patch
|
blob
|
history
diff --git
a/version.py
b/version.py
index
e9419a0
..
b4fb38a
100755
(executable)
--- a/
version.py
+++ b/
version.py
@@
-21,10
+21,16
@@
cmd = [
if "short" in argv:
cmd.append("--abbrev=0")
if "short" in argv:
cmd.append("--abbrev=0")
-result = subp.run(cmd, stdout=subp.PIPE, encoding="utf-8")
-version = result.stdout
+version = None
-if result.returncode or not version:
+try:
+ result = subp.run(cmd, stdout=subp.PIPE, encoding="utf-8")
+ if not result.returncode:
+ version = result.stdout
+except FileNotFoundError:
+ pass
+
+if not version:
try:
with open(path.join(source_root, "VERSION"), "r") as f:
version = f.read().strip()
try:
with open(path.join(source_root, "VERSION"), "r") as f:
version = f.read().strip()