[apparmor] [patch 5/6] Get revision from stamp file if not in bzr

[Kees Cook]

ACK

On Thu, Oct 07, 2010 at 03:09:04PM -0700, Steve Beattie wrote:
> This patch takes the revision info from the stamp file if things are
> being built outside of a working bzr tree.
> ---
>  common/Make.rules |    4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> Index: b/common/Make.rules
> ===================================================================
> --- a/common/Make.rules
> +++ b/common/Make.rules
> @@ -80,9 +80,7 @@ RPMARG=--define "_topdir $(BUILDDIR:/=)"
>  #				/usr/bin/svn info . 2> /dev/null | grep "^Last Changed Rev:" | sed "s/^Last Changed Rev: //" ; \
>  #			fi ; \
>  #		      fi)
> -REPO_VERSION=$(shell if [ -x /usr/bin/bzr ] ; then \
> -				(/usr/bin/bzr version-info . 2> /dev/null || echo revno: 1) | awk '/^revno:/ { print $$2 }' ; \
> -		      fi)
> +REPO_VERSION=$(shell ([ -x /usr/bin/bzr ] && /usr/bin/bzr version-info . 2> /dev/null || awk '{ print "revno: "$$2 }' common/.stamp_rev) | awk '/^revno:/ { print $$2 }' )
>  REPO_URL=$(shell if [ -x /usr/bin/svn ] ; then \
>  			/usr/bin/svn info . 2> /dev/null | grep "^URL:" | sed "s/^URL: //" ; \
>  		 fi)
> 
> 
> -- 
> AppArmor mailing list
> AppArmor at lists.ubuntu.com
> Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/apparmor
-- 
Kees Cook
Ubuntu Security Team