diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2019-10-16 08:52:56 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2019-10-16 08:52:56 +0000 |
| commit | c6a7f43535138f86acd9e3c800618363be5b8e93 (patch) | |
| tree | 69fede11f727faae004d10dea3a802d638511732 | |
| parent | 1d4703b5dbed7bf2f4af0c11c49dfd43f07bba9e (diff) | |
| parent | 67a1ec49e75225d27a91e6e8767b7b6acbb8e7bd (diff) | |
| download | buildstream-c6a7f43535138f86acd9e3c800618363be5b8e93.tar.gz | |
Merge branch 'aevri/oldgit' into 'master'
testing/.../site: windows-friendly HAVE_OLD_GIT
See merge request BuildStream/buildstream!1643
| -rw-r--r-- | src/buildstream/testing/_utils/site.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/buildstream/testing/_utils/site.py b/src/buildstream/testing/_utils/site.py index b098b7d41..ca74d9505 100644 --- a/src/buildstream/testing/_utils/site.py +++ b/src/buildstream/testing/_utils/site.py @@ -16,7 +16,9 @@ try: HAVE_GIT = True out = str(subprocess.check_output(['git', '--version']), "utf-8") - version = tuple(int(x) for x in out.split(' ')[2].split('.')) + # e.g. on Git for Windows we get "git version 2.21.0.windows.1". + # e.g. on Mac via Homebrew we get "git version 2.19.0". + version = tuple(int(x) for x in out.split(' ')[2].split('.')[:3]) HAVE_OLD_GIT = version < (1, 8, 5) GIT_ENV = { |