This is an automated email from the git hooks/post-receive script.
lunar pushed a commit to branch pu/reproducible_builds
in repository dh-python.
commit 6924e0b0a0b883e2206da5692cab64301839733b
Author: Piotr Ożarowski <pi...@debian.org>
Date: Tue Sep 3 20:24:16 2013 +0200
do not rename extensions in multiarch dirs
---
debian/changelog | 7 +++++++
dhpython/__init__.py | 3 +++
dhpython/fs.py | 4 ++++
3 files changed, 14 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 9e7bab3..d8e9f42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dh-python (1.20130902-2) unstable; urgency=low
+
+ * Do not rename extensions in directories that include architecture triplet
+ as part of the path (closes: 721696)
+
+ -- Piotr Ożarowski <pi...@debian.org> Tue, 03 Sep 2013 20:20:43 +0200
+
dh-python (1.20130902-1) unstable; urgency=low
* Fix DESTDIR guessing (from --name) for non-default interpreter versions
diff --git a/dhpython/__init__.py b/dhpython/__init__.py
index 39fa8b7..b330192 100644
--- a/dhpython/__init__.py
+++ b/dhpython/__init__.py
@@ -39,6 +39,9 @@ INTERPRETER_DIR_TPLS = {
'cpython3': r'.*/python3(?:\.\d+)?/',
'pypy': r'.*/pypy/'}
+MULTIARCH_DIR_TPL = re.compile(
+ '.*/([a-z][^/-]+-(?:linux|kfreebsd|gnu)(?:-[^/-]+)?)(?:/.*|$)')
+
# Interpreter site-directories
OLD_SITE_DIRS = {
'cpython2': [
diff --git a/dhpython/fs.py b/dhpython/fs.py
index 1cf0e71..0f07aca 100644
--- a/dhpython/fs.py
+++ b/dhpython/fs.py
@@ -25,6 +25,7 @@ from filecmp import cmp as cmpfile
from os.path import exists, isdir, islink, join, split
from shutil import rmtree
from stat import ST_MODE, S_IXUSR, S_IXGRP, S_IXOTH
+from dhpython import MULTIARCH_DIR_TPL
from dhpython.tools import fix_shebang, clean_egg_name
from dhpython.interpreter import Interpreter
@@ -269,6 +270,9 @@ class Scan:
log.info('renaming %s to %s', dstfpath, fname)
os.rename(dstfpath, fpath)
+ if MULTIARCH_DIR_TPL.match(fpath):
+ # ignore /lib/i386-linux-gnu/, /usr/lib/x86_64-kfreebsd-gnu/, etc.
+ return fpath
new_fn = self.interpreter.check_extname(fname,
self.current_pub_version)
if new_fn:
# TODO: what about symlinks pointing to this file
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/reproducible/dh-python.git
_______________________________________________
Reproducible-builds mailing list
Reproducible-builds@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/reproducible-builds
