bzr version-info supports directly printing the bare revno to stdout so we should use that instead of parsing the default verbose output.
This change simplifies the shell snippet used to assign the REPO_VERSION_CMD make variable. It was also tested to work with the bzr present in Ubuntu 12.04. Signed-off-by: Tyler Hicks <[email protected]> Acked-by: Christian Boltz <[email protected]> Acked-by: Steve Beattie <[email protected]> --- common/Make.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/Make.rules b/common/Make.rules index 148f80e..c20277b 100644 --- a/common/Make.rules +++ b/common/Make.rules @@ -45,7 +45,7 @@ define nl endef -REPO_VERSION_CMD=([ -x /usr/bin/bzr ] && /usr/bin/bzr version-info . 2> /dev/null || awk '{ print "revno: "$2 }' common/.stamp_rev) | awk '/^revno:/ { print $2 }' +REPO_VERSION_CMD=[ -x /usr/bin/bzr ] && /usr/bin/bzr version-info --custom --template="{revno}" . 2> /dev/null || awk '{ print $2 }' common/.stamp_rev ifndef PYTHON_VERSIONS PYTHON_VERSIONS = $(call map, pathsearch, python2 python3) -- 2.5.0 -- AppArmor mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
