Patchwork [5,of,5,STABLE,V2] builddeb: copy over .gz and .dsc files

login
register
mail settings
Submitter Sean Farley
Date April 20, 2016, 6:01 p.m.
Message ID <70bafbc1246856910fc2.1461175318@laptop.office.atlassian.com>
Download mbox | patch
Permalink /patch/14737/
State Accepted
Headers show

Comments

Sean Farley - April 20, 2016, 6:01 p.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1460755706 25200
#      Fri Apr 15 14:28:26 2016 -0700
# Branch stable
# Node ID 70bafbc1246856910fc286ec35f3be342504220c
# Parent  cc3a1eb82ade4b2d2250ce7dd569f1283dce4503
# EXP-Topic ppa
builddeb: copy over .gz and .dsc files

We were forgetting to copy over the signature (if it exists) and the zipped
diff, so let's do that.
Augie Fackler - April 20, 2016, 9:02 p.m.
These are queued, thanks. Very nice work on that sed portability find, I had given up.

> On Apr 20, 2016, at 14:01, Sean Farley <sean@farley.io> wrote:
> 
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1460755706 25200
> #      Fri Apr 15 14:28:26 2016 -0700
> # Branch stable
> # Node ID 70bafbc1246856910fc286ec35f3be342504220c
> # Parent  cc3a1eb82ade4b2d2250ce7dd569f1283dce4503
> # EXP-Topic ppa
> builddeb: copy over .gz and .dsc files
> 
> We were forgetting to copy over the signature (if it exists) and the zipped
> diff, so let's do that.
> 
> diff --git a/contrib/builddeb b/contrib/builddeb
> --- a/contrib/builddeb
> +++ b/contrib/builddeb
> @@ -82,10 +82,11 @@ fi
> if [ "$CLEANUP" ] ; then
>     echo
>     OUTPUTDIR=${OUTPUTDIR:=packages/$DISTID-$CODENAME}
>     mkdir -p "$OUTPUTDIR"
>     find ../mercurial*.deb ../mercurial_*.build ../mercurial_*.changes \
> +          ../mercurial*.dsc ../mercurial*.gz \
>           -type f -newer $control -print0 2>/dev/null | \
>       xargs -Inarf -0 mv narf "$OUTPUTDIR"
>     echo "Built packages for $debver:"
>     find "$OUTPUTDIR" -type f -newer $control -name '*.deb'
> fi
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/contrib/builddeb b/contrib/builddeb
--- a/contrib/builddeb
+++ b/contrib/builddeb
@@ -82,10 +82,11 @@  fi
 if [ "$CLEANUP" ] ; then
     echo
     OUTPUTDIR=${OUTPUTDIR:=packages/$DISTID-$CODENAME}
     mkdir -p "$OUTPUTDIR"
     find ../mercurial*.deb ../mercurial_*.build ../mercurial_*.changes \
+          ../mercurial*.dsc ../mercurial*.gz \
           -type f -newer $control -print0 2>/dev/null | \
       xargs -Inarf -0 mv narf "$OUTPUTDIR"
     echo "Built packages for $debver:"
     find "$OUTPUTDIR" -type f -newer $control -name '*.deb'
 fi