[PATCH] [SRU Xenial/Yakkety/Zesty] [Artful] [unstable] UBUNTU: [Packaging] exact extend-diff-ignore matches

[Andy Whitcroft]

On Thu, May 25, 2017 at 11:33:54AM -0300, Thadeu Lima de Souza Cascardo wrote:
> BugLink: http://bugs.launchpad.net/bugs/1693504
> 
> gen-auto-reconstruct script adds extend-diff-ignore options to
> debian/source/options for symlinks not found in the orig tarball.
> 
> These options, however, are regular expressions, and match any part of a
> file path. This may cause some files to be excluded from source when
> they are not an exact match, but are a partial match to those symlinks.
> 
> Using beggining and end of string metacharacters fix the issue.
> 
> This problem was found in one of the derivatives, which contained a
> symlink, whose name was a prefix for a directory in the same path,
> leading that entire directory to be excluded from source.
> 
> Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo at canonical.com>
> ---
>  debian/scripts/misc/gen-auto-reconstruct | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian/scripts/misc/gen-auto-reconstruct b/debian/scripts/misc/gen-auto-reconstruct
> index a76e341a5e98..45abd3df725f 100755
> --- a/debian/scripts/misc/gen-auto-reconstruct
> +++ b/debian/scripts/misc/gen-auto-reconstruct
> @@ -52,7 +52,7 @@ fi
>  	git diff "$tag.." --raw --no-renames | awk '(/^:000000 120000/ && $5 == "A") { print $NF }' | \
>  	while read name
>  	do
> -		echo "extend-diff-ignore=$name"
> +		echo "extend-diff-ignore=^$name$"
>  	done
>  ) >"$options.update"

If they are regular expressions what you propose makes sense.  However
the trailing $ probabally needs quoting \$ to prevent it being expanded.

-apw