aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/command/bdist_egg.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-05-03 23:09:46 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-05-03 23:09:46 -0400
commitff75a6cbdbcde8d9e3b979c30c3d6e64a1bc5374 (patch)
tree6bc72488f8f69a175fcfd3540f0a3ac701b244f5 /setuptools/command/bdist_egg.py
parentb33cf3e333837cf2fa04af79bcd46094a047741b (diff)
downloadexternal_python_setuptools-ff75a6cbdbcde8d9e3b979c30c3d6e64a1bc5374.tar.gz
external_python_setuptools-ff75a6cbdbcde8d9e3b979c30c3d6e64a1bc5374.tar.bz2
external_python_setuptools-ff75a6cbdbcde8d9e3b979c30c3d6e64a1bc5374.zip
Copy changes from 1aae1efe5733 for setuptools/command/* (except easy_install.py
--HG-- branch : Setuptools-Distribute merge extra : source : 0c89fbb19c269ce1cb3bc3e9ece9864127768169
Diffstat (limited to 'setuptools/command/bdist_egg.py')
-rw-r--r--setuptools/command/bdist_egg.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py
index 9e852a3f..7e5a3799 100644
--- a/setuptools/command/bdist_egg.py
+++ b/setuptools/command/bdist_egg.py
@@ -165,12 +165,13 @@ class bdist_egg(Command):
def run(self):
# Generate metadata first
self.run_command("egg_info")
-
# We run install_lib before install_data, because some data hacks
# pull their data path from the install_lib command.
log.info("installing library code to %s" % self.bdist_dir)
instcmd = self.get_finalized_command('install')
old_root = instcmd.root; instcmd.root = None
+ if self.distribution.has_c_libraries() and not self.skip_build:
+ self.run_command('build_clib')
cmd = self.call_command('install_lib', warn_dir=0)
instcmd.root = old_root
@@ -190,7 +191,6 @@ class bdist_egg(Command):
to_compile.extend(self.make_init_files())
if to_compile:
cmd.byte_compile(to_compile)
-
if self.distribution.data_files:
self.do_install_data()
@@ -398,7 +398,7 @@ def write_safety_flag(egg_dir, safe):
for flag,fn in safety_flags.items():
fn = os.path.join(egg_dir, fn)
if os.path.exists(fn):
- if safe is None or bool(safe)<>flag:
+ if safe is None or bool(safe)!=flag:
os.unlink(fn)
elif safe is not None and bool(safe)==flag:
f=open(fn,'wb'); f.write('\n'); f.close()