Skip to content
Snippets Groups Projects
Commit af27c4e1 authored by Piotr Ożarowski's avatar Piotr Ożarowski
Browse files

fix checking shebangs in private directories (executable bit wasn't

checked correctly)
parent 7091ee17
No related branches found
Tags debian/2.6.6-9
No related merge requests found
...@@ -8,6 +8,8 @@ python-defaults (2.6.6-11) UNRELEASED; urgency=low ...@@ -8,6 +8,8 @@ python-defaults (2.6.6-11) UNRELEASED; urgency=low
- replace a file with a symlink also if there's a matching one in - replace a file with a symlink also if there's a matching one in
pyshared directory already pyshared directory already
- add support for DH_OPTIONS env. variable - add support for DH_OPTIONS env. variable
- fix checking shebangs in private directories (executable bit wasn't
checked correctly)
* pycompile: * pycompile:
- --exclude now works with private dirs - --exclude now works with private dirs
- use /usr/bin/pythonX.Y rather than pythonX.Y (to avoid /usr/local - use /usr/bin/pythonX.Y rather than pythonX.Y (to avoid /usr/local
......
...@@ -373,7 +373,7 @@ def scan(package, dname=None): ...@@ -373,7 +373,7 @@ def scan(package, dname=None):
elif private_dir: elif private_dir:
mode = os.stat(join(root, fn))[ST_MODE] mode = os.stat(join(root, fn))[ST_MODE]
if mode is S_IXUSR or mode is S_IXGRP or mode is S_IXOTH: if mode & S_IXUSR or mode & S_IXGRP or mode & S_IXOTH:
res = shebang2pyver(join(root, fn)) res = shebang2pyver(join(root, fn))
if res: if res:
r['private_dirs'].setdefault(private_dir, {})\ r['private_dirs'].setdefault(private_dir, {})\
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment