Patchwork [evolve-ext] debian: don't delete evolve and topic extensions

login
register
mail settings
Submitter via Mercurial-devel
Date March 9, 2017, 9:06 p.m.
Message ID <6ad870e6eee1f85ccbae.1489093618@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/19064/
State Accepted
Headers show

Comments

via Mercurial-devel - March 9, 2017, 9:06 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1489092451 28800
#      Thu Mar 09 12:47:31 2017 -0800
# Node ID 6ad870e6eee1f85ccbae4085e60b8e750c874934
# Parent  7d15775d85857c13843dd1c76626293550006d81
debian: don't delete evolve and topic extensions

The debian packaging rules deletes all __init__.py to avoid
conflicting with the __init__.py that declares the namespace
package. Now that the evolve and topic extensions also live in
__init__.py files, we clearly don't want to delete all __init__.py
files anymore; only the hgext3rd/__init__.py should be deleted.
Pierre-Yves David - March 10, 2017, 12:41 a.m.
On 03/09/2017 01:06 PM, Martin von Zweigbergk via Mercurial-devel wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz@google.com>
> # Date 1489092451 28800
> #      Thu Mar 09 12:47:31 2017 -0800
> # Node ID 6ad870e6eee1f85ccbae4085e60b8e750c874934
> # Parent  7d15775d85857c13843dd1c76626293550006d81
> debian: don't delete evolve and topic extensions
>
> The debian packaging rules deletes all __init__.py to avoid
> conflicting with the __init__.py that declares the namespace
> package. Now that the evolve and topic extensions also live in
> __init__.py files, we clearly don't want to delete all __init__.py
> files anymore; only the hgext3rd/__init__.py should be deleted.

pushed, thanks.

Patch

diff -r 7d15775d8585 -r 6ad870e6eee1 debian/rules
--- a/debian/rules	Thu Mar 09 10:42:50 2017 -0800
+++ b/debian/rules	Thu Mar 09 12:47:31 2017 -0800
@@ -18,8 +18,8 @@ 
 endif
 
 override_dh_python2:
-	# avoid conflict with mercurial's own hgext/__init__.py
-	find debian -name __init__.py -delete
+	# avoid conflict with mercurial's own hgext3rd/__init__.py
+	find debian -path '*/hgext3rd/__init__.py' -delete
 	dh_python2
 
 override_dh_auto_clean: clean-docs