Patchwork [fix-ppa,STABLE] make: add new directory 'hgdemandimport' to cleanbutpackages rule

login
register
mail settings
Submitter Sean Farley
Date July 30, 2017, 2:33 a.m.
Message ID <18c67cd6cb9936d3d2a5.1501382008@1.0.0.127.in-addr.arpa>
Download mbox | patch
Permalink /patch/22584/
State Accepted
Headers show

Comments

Sean Farley - July 30, 2017, 2:33 a.m.
# HG changeset patch
# User Sean Farley <sean@farley.io>
# Date 1501380768 25200
#      Sat Jul 29 19:12:48 2017 -0700
# Branch fix-ppa
# Node ID 18c67cd6cb9936d3d2a567558cc1fa2a2d157438
# Parent  850d2ec2cf6a266987a401752c909f95dd8c4c53
make: add new directory 'hgdemandimport' to cleanbutpackages rule

This fixes the build process for ppa (at least in my simple check).
Perhaps we should loop through all directory that aren't 'packages'?
Yuya Nishihara - July 30, 2017, 4:47 a.m.
On Sat, 29 Jul 2017 19:33:28 -0700, Sean Farley wrote:
> # HG changeset patch
> # User Sean Farley <sean@farley.io>
> # Date 1501380768 25200
> #      Sat Jul 29 19:12:48 2017 -0700
> # Branch fix-ppa
> # Node ID 18c67cd6cb9936d3d2a567558cc1fa2a2d157438
> # Parent  850d2ec2cf6a266987a401752c909f95dd8c4c53
> make: add new directory 'hgdemandimport' to cleanbutpackages rule

Sure, queued, thanks.

Patch

diff --git a/Makefile b/Makefile
index be08770..feec2e6 100644
--- a/Makefile
+++ b/Makefile
@@ -61,11 +61,11 @@  wheel:
 doc:
 	$(MAKE) -C doc
 
 cleanbutpackages:
 	-$(PYTHON) setup.py clean --all # ignore errors from this command
-	find contrib doc hgext hgext3rd i18n mercurial tests \
+	find contrib doc hgext hgext3rd i18n mercurial tests hgdemandimport \
 		\( -name '*.py[cdo]' -o -name '*.so' \) -exec rm -f '{}' ';'
 	rm -f MANIFEST MANIFEST.in hgext/__index__.py tests/*.err
 	rm -f mercurial/__modulepolicy__.py
 	if test -d .hg; then rm -f mercurial/__version__.py; fi
 	rm -rf build mercurial/locale