[Pkg-xen-devel] [PATCH 09/19] d/shuffle-boot-files: Merge arguments together

[Hans van Kranenburg]

On 9/21/20 12:38 AM, Elliott Mitchell wrote:
> Rather than passing two strings which are then joined repeatedly and
> used to replace filename versions, turn them into a single string.
> 
> Signed-off-by: Elliott Mitchell <ehem+debian at m5p.com>
> ---
>  debian/rules              | 2 +-
>  debian/shuffle-boot-files | 7 +++----
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/debian/rules b/debian/rules
> index c7dc55ad03..95f3cc4311 100755
> --- a/debian/rules
> +++ b/debian/rules
> @@ -273,7 +273,7 @@ xenstore_rm = $(addprefix debian/xen-utils-common/,		\
>  override_dh_install:
>  	debian/shuffle-binaries $(upstream_version)
>  	:
> -	debian/shuffle-boot-files $(upstream_version) $(flavour)
> +	debian/shuffle-boot-files $(upstream_version)-$(flavour)
>  	:
>  	dh_install $(dh_install_excludes)
>  	if test -d debian/xen-utils-common; then rm -v $(xenstore_rm); fi
> diff --git a/debian/shuffle-boot-files b/debian/shuffle-boot-files
> index 683788d40a..0fb6567ad1 100755
> --- a/debian/shuffle-boot-files
> +++ b/debian/shuffle-boot-files
> @@ -2,11 +2,10 @@
>  
>  set -e
>  
> -version="$1"; shift
> -flavour="$1"; shift
> +newvers="$1"; shift
>  t=debian/tmp
>  
> -hv="xen-hypervisor-$version-$flavour"
> +hv="xen-hypervisor-$newvers"
>  dest="debian/$hv/boot"
>  mkdir -p "$dest"
>  
> @@ -27,5 +26,5 @@ verstring="${verstring##*/}"
>  verstring="${verstring%.gz}"
>  
>  for f in `cd "$t/boot" && find * -type f -print`; do
> -	cp -v "$t/boot/$f" "$dest/${f/$verstring/xen-$version-$flavour}"
> +	cp -v "$t/boot/$f" "$dest/${f/$verstring/xen-$newvers}"
>  done
> 


~/build/xen/debian-xen k (knorrie/sid) 0-$ git am -3
20201204-2028-ehem/09\ d_shuffle-boot-files\:\ Merge\ arguments\
together\ -\ Elliott\ Mitchell\ \<ehem+debian at m5p.com\>\ -\ 2020-09-21\
0038.eml
Applying: d/shuffle-boot-files: Merge arguments together
error: sha1 information is lacking or useless (debian/rules).
error: could not build fake ancestor
Patch failed at 0001 d/shuffle-boot-files: Merge arguments together
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

And, yes, git am --show-current-patch shows me stuff like

CWRlYmlhbi9zaHVmZmxlLWJvb3QtZmlsZXMgJCh1cHN0cmVhbV92ZXJzaW9u
KSAkKGZsYXZvdXIpCisJZGViaWFuL3NodWZmbGUt

K