From 537477335449c7730633d321905c57f694441eb3 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@brickies.net>
Date: Tue, 9 Aug 2016 02:59:29 -0400
Subject: read-version: do not attempt git-describe if no git.

Even if there is a .git directory, we can't use git if there
is no git executable in the path.  In that case just fall back
to the cloud-init version.
---
 tools/read-version | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/read-version b/tools/read-version
index 85c62343..5ecf7247 100755
--- a/tools/read-version
+++ b/tools/read-version
@@ -26,6 +26,25 @@ def tiny_p(cmd, capture=True):
     return out
 
 
+def which(program):
+    # Return path of program for execution if found in path
+    def is_exe(fpath):
+        return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
+
+    _fpath, _ = os.path.split(program)
+    if _fpath:
+        if is_exe(program):
+            return program
+    else:
+        for path in os.environ.get("PATH", "").split(os.pathsep):
+            path = path.strip('"')
+            exe_file = os.path.join(path, program)
+            if is_exe(exe_file):
+                return exe_file
+
+    return None
+
+
 use_long = '--long' in sys.argv or os.environ.get('CI_RV_LONG')
 use_tags = '--tags' in sys.argv or os.environ.get('CI_RV_TAGS')
 output_json = '--json' in sys.argv
@@ -33,7 +52,7 @@ output_json = '--json' in sys.argv
 src_version = ci_version.version_string()
 version_long = None
 
-if os.path.isdir(os.path.join(_tdir, ".git")):
+if os.path.isdir(os.path.join(_tdir, ".git")) and which("git"):
     flags = []
     if use_tags:
         flags = ['--tags']
-- 
cgit v1.2.3


From 3973223593ab7bded806f02473164ac105f2896e Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Tue, 9 Aug 2016 23:02:28 -0600
Subject: make-tarball: older versions of git with --format=tar.

Some older versions of git (Centos 6) do not have --format=tar.gz.
To work around this, create a .tar file and then compress it.
---
 tools/make-tarball | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tools')

diff --git a/tools/make-tarball b/tools/make-tarball
index d8705896..c150dd2f 100755
--- a/tools/make-tarball
+++ b/tools/make-tarball
@@ -55,5 +55,9 @@ if [ "$rev" = HEAD ] && ! git diff-index --quiet HEAD --; then
     fi
 fi
 
-git archive --format=tar.gz --prefix="$archive_base/" "$rev" > "$output"
+TEMP_D=$(mktemp -d)
+tar=${output##*/}
+tar="$TEMP_D/${tar%.gz}"
+git archive --format=tar --prefix="$archive_base/" "$rev" > "$tar"
+gzip -9 -c "$tar" > "$output"
 echo "$output"
-- 
cgit v1.2.3