From a70c9725729006c8582a690ebd515aa5c2123a0f Mon Sep 17 00:00:00 2001 From: James Duley Date: Thu, 19 Feb 2015 10:43:15 +1300 Subject: [PATCH] OP-1733_version-info.py_check_for_json_first --- make/scripts/version-info.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/scripts/version-info.py b/make/scripts/version-info.py index 67dd6d95f..889925700 100644 --- a/make/scripts/version-info.py +++ b/make/scripts/version-info.py @@ -113,15 +113,15 @@ class Repo: """Initialize object instance and read repo info""" self._path = path self._exec('rev-parse --verify HEAD') - if self._rc == 0: + if self._load_json(): + pass + elif self._rc == 0: self._hash = self._out.strip(' \t\n\r') self._get_origin() self._get_time() self._get_tag() self._get_branch() self._get_dirty() - elif self._load_json(): - pass else: self._hash = None self._origin = None