diff options
Diffstat (limited to 'setuptools')
| -rw-r--r-- | setuptools/__init__.py | 2 | ||||
| -rwxr-xr-x | setuptools/command/bdist_rpm.py | 2 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/setuptools/__init__.py b/setuptools/__init__.py index 0a64bf65..c58254a5 100644 --- a/setuptools/__init__.py +++ b/setuptools/__init__.py @@ -7,7 +7,7 @@ from distutils.core import Command as _Command from distutils.util import convert_path import os.path -__version__ = '0.6c4' +__version__ = '0.6c5' __all__ = [ 'setup', 'Distribution', 'Feature', 'Command', 'Extension', 'Require', 'find_packages' diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py index 9ca75e10..24e851a4 100755 --- a/setuptools/command/bdist_rpm.py +++ b/setuptools/command/bdist_rpm.py @@ -18,7 +18,7 @@ class bdist_rpm(_bdist_rpm): _bdist_rpm.move_file(self, src, dst, level) if dst==self.dist_dir and src.endswith('.rpm'): getattr(self.distribution,'dist_files',[]).append( - ('bdist_egg', + ('bdist_rpm', src.endswith('.src.rpm') and 'any' or get_python_version(), os.path.join(dst, os.path.basename(src))) ) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 79a441bd..f718d3d4 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -983,16 +983,22 @@ See the setuptools documentation for the "develop" command for more info. return dst # only unpack-and-compile skips files for dry run def unpack_and_compile(self, egg_path, destination): - to_compile = [] + to_compile = []; to_chmod = [] def pf(src,dst): if dst.endswith('.py') and not src.startswith('EGG-INFO/'): to_compile.append(dst) - self.unpack_progress(src,dst) + self.unpack_progress(src,dst); to_chmod.append(dst) return not self.dry_run and dst or None unpack_archive(egg_path, destination, pf) self.byte_compile(to_compile) + if not self.dry_run: + flags = stat.S_IXGRP|stat.S_IXGRP + for f in to_chmod: + mode = ((os.stat(f)[stat.ST_MODE]) | 0555) & 07777 + log.debug("changing mode of %s to %o", f, mode) + os.chmod(f, mode) def byte_compile(self, to_compile): @@ -1017,12 +1023,6 @@ See the setuptools documentation for the "develop" command for more info. - - - - - - def no_default_version_msg(self): return """bad install directory or PYTHONPATH |