diff options
| author | Scott Moser <smoser@brickies.net> | 2017-10-05 14:25:59 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-10-05 14:35:42 -0400 |
| commit | 3ecf3afb1ff3a8372bd3ac269bce1ccfc9061617 (patch) | |
| tree | 531fe4c26b4ad16684b43e573287562dfd87338c /debian | |
| parent | 18dda935c06dc6ccb2968f8a14b9f86e0a0bd3b3 (diff) | |
| download | vyos-cloud-init-3ecf3afb1ff3a8372bd3ac269bce1ccfc9061617.tar.gz vyos-cloud-init-3ecf3afb1ff3a8372bd3ac269bce1ccfc9061617.zip | |
debian/new-upstream-snapshot: use --abbrev=8 for git-describe.
The tools that use "git describe" were just assuming a consisent
number of characters in the hash. It seems ubuntu 16.04 would use 7
and later versions use 8. To avoid that discrepency in developer
environments, set it to 8.
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/new-upstream-snapshot | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/debian/new-upstream-snapshot b/debian/new-upstream-snapshot index 4e7aaa0e..6ad8af61 100755 --- a/debian/new-upstream-snapshot +++ b/debian/new-upstream-snapshot @@ -85,9 +85,8 @@ pkg_name=$(dpkg-parsechangelog --show-field Source) || t=${prev_pkg_ver%-*} prev_pkg_hash=${t##*-g} -new_pkg_upstream=$(git describe master) new_pkg_debian="0ubuntu1" -new_upstream_ver=$(git describe "${from_ref}") +new_upstream_ver=$(git describe --abbrev=8 "${from_ref}") new_pkg_ver="${new_upstream_ver}-${new_pkg_debian}" prev_upstream_ver=${prev_pkg_ver%-*} |