diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-08-11 12:27:38 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-08-11 12:27:38 +0100 |
| commit | 0d5d16074ff1aa1cb264db2d514a51e7a7d34ad6 (patch) | |
| tree | 11e45efa30bbdd299f8ff85135c11fc5c6a1b107 | |
| parent | 7027fd53438f36cdfc417df4b667575671a1c857 (diff) | |
| download | micropython-0d5d16074ff1aa1cb264db2d514a51e7a7d34ad6.tar.gz micropython-0d5d16074ff1aa1cb264db2d514a51e7a7d34ad6.zip | |
py/makeversionhdr.py: Fallback to using docs version if no git repo.
Addresses issue #1420.
| -rw-r--r-- | py/makeversionhdr.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py index 708d67df7f..468cf9e55f 100644 --- a/py/makeversionhdr.py +++ b/py/makeversionhdr.py @@ -21,8 +21,11 @@ def get_version_info_from_git(): # Note: git describe doesn't work if no tag is available try: - git_tag = subprocess.check_output(["git", "describe", "--dirty", "--always"], universal_newlines=True).strip() - except subprocess.CalledProcessError: + git_tag = subprocess.check_output(["git", "describe", "--dirty", "--always"], stderr=subprocess.STDOUT, universal_newlines=True).strip() + except subprocess.CalledProcessError as er: + if er.args[0] == 128: + # git exit code of 128 means no repository found + return None git_tag = "" except OSError: return None |