Patchwork [5,of,5,STABLE] make: remove packages directory in clean rule

login
register
mail settings
Submitter Sean Farley
Date April 16, 2016, 8:36 p.m.
Message ID <41ec1d15655a64a695b2.1460838985@laptop.local>
Download mbox | patch
Permalink /patch/14687/
State Accepted
Commit 9fb2e8c8f3204a610eab3576d6aaf2fa7b8bc450
Headers show

Comments

Sean Farley - April 16, 2016, 8:36 p.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1460751034 25200
#      Fri Apr 15 13:10:34 2016 -0700
# Branch stable
# Node ID 41ec1d15655a64a695b29007fcd9762976a44ada
# Parent  06027f4c174a930cbeb1d1d7b0b85a5990244f11
# EXP-Topic ppa
make: remove packages directory in clean rule
Sean Farley - April 16, 2016, 9:06 p.m.
Sean Farley <sean@farley.io> writes:

> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1460751034 25200
> #      Fri Apr 15 13:10:34 2016 -0700
> # Branch stable
> # Node ID 41ec1d15655a64a695b29007fcd9762976a44ada
> # Parent  06027f4c174a930cbeb1d1d7b0b85a5990244f11
> # EXP-Topic ppa
> make: remove packages directory in clean rule

It seems this series fails to build on stable (due to me not testing). I
guess this series is meant for after the freeze (once hgext3rd and chg
exist for the makefile).
Pierre-Yves David - April 16, 2016, 9:34 p.m.
On 04/16/2016 02:06 PM, Sean Farley wrote:
> Sean Farley <sean@farley.io> writes:
>
>> # HG changeset patch
>> # User Sean Farley <sean@farley.io>
>> # Date 1460751034 25200
>> #      Fri Apr 15 13:10:34 2016 -0700
>> # Branch stable
>> # Node ID 41ec1d15655a64a695b29007fcd9762976a44ada
>> # Parent  06027f4c174a930cbeb1d1d7b0b85a5990244f11
>> # EXP-Topic ppa
>> make: remove packages directory in clean rule
> It seems this series fails to build on stable (due to me not testing). I
> guess this series is meant for after the freeze (once hgext3rd and chg
> exist for the makefile).

Any reason not to take them for default and have them merge into stable 
for the RC?
Sean Farley - April 16, 2016, 9:36 p.m.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> writes:

> On 04/16/2016 02:06 PM, Sean Farley wrote:
>> Sean Farley <sean@farley.io> writes:
>>
>>> # HG changeset patch
>>> # User Sean Farley <sean@farley.io>
>>> # Date 1460751034 25200
>>> #      Fri Apr 15 13:10:34 2016 -0700
>>> # Branch stable
>>> # Node ID 41ec1d15655a64a695b29007fcd9762976a44ada
>>> # Parent  06027f4c174a930cbeb1d1d7b0b85a5990244f11
>>> # EXP-Topic ppa
>>> make: remove packages directory in clean rule
>> It seems this series fails to build on stable (due to me not testing). I
>> guess this series is meant for after the freeze (once hgext3rd and chg
>> exist for the makefile).
>
> Any reason not to take them for default and have them merge into stable 
> for the RC?

Sure, go for it.
Matt Mackall - April 16, 2016, 10:40 p.m.
On Sat, 2016-04-16 at 13:36 -0700, Sean Farley wrote:
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1460751034 25200
> #      Fri Apr 15 13:10:34 2016 -0700
> # Branch stable
> # Node ID 41ec1d15655a64a695b29007fcd9762976a44ada
> # Parent  06027f4c174a930cbeb1d1d7b0b85a5990244f11
> # EXP-Topic ppa
> make: remove packages directory in clean rule

These are queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.

Patch

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -62,11 +62,11 @@  clean:
 	find contrib doc hgext hgext3rd i18n mercurial tests \
 		\( -name '*.py[cdo]' -o -name '*.so' \) -exec rm -f '{}' ';'
 	rm -f $(addprefix mercurial/,$(notdir $(wildcard mercurial/pure/[a-z]*.py)))
 	rm -f MANIFEST MANIFEST.in hgext/__index__.py tests/*.err
 	if test -d .hg; then rm -f mercurial/__version__.py; fi
-	rm -rf build mercurial/locale
+	rm -rf build packages mercurial/locale
 	$(MAKE) -C doc clean
 	$(MAKE) -C contrib/chg distclean
 
 install: install-bin install-doc