[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command bdist_egg.py, 1.16, 1.17
pje@users.sourceforge.net
pje at users.sourceforge.net
Tue Jun 14 17:30:34 CEST 2005
Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29928/setuptools/command
Modified Files:
bdist_egg.py
Log Message:
Add support for quiet/verbose/dry-run/optimize flags.
Index: bdist_egg.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/bdist_egg.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- bdist_egg.py 12 Jun 2005 21:47:34 -0000 1.16
+++ bdist_egg.py 14 Jun 2005 15:30:32 -0000 1.17
@@ -190,7 +190,7 @@
if not self.dry_run:
os.unlink(native_libs)
- if self.egg_info:
+ if self.egg_info and os.path.exists(self.egg_info):
for filename in os.listdir(self.egg_info):
path = os.path.join(self.egg_info,filename)
if os.path.isfile(path):
@@ -231,7 +231,7 @@
for dirname in INSTALL_DIRECTORY_ATTRS:
kw.setdefault(dirname,self.bdist_dir)
kw.setdefault('skip_build',self.skip_build)
-
+ kw.setdefault('dry_run', self.dry_run)
cmd = self.reinitialize_command(cmdname, **kw)
self.run_command(cmdname)
return cmd
@@ -262,24 +262,24 @@
import zipfile
mkpath(os.path.dirname(zip_filename), dry_run=dry_run)
- # If zipfile module is not available, try spawning an external
- # 'zip' command.
- log.info("creating '%s' and adding '%s' to it",
- zip_filename, base_dir)
+ log.info("creating '%s' and adding '%s' to it", zip_filename, base_dir)
def visit (z, dirname, names):
for name in names:
path = os.path.normpath(os.path.join(dirname, name))
if os.path.isfile(path):
p = path[len(base_dir)+1:]
- z.write(path, p)
- log.info("adding '%s'" % p)
+ if not dry_run:
+ z.write(path, p)
+ log.debug("adding '%s'" % p)
if not dry_run:
z = zipfile.ZipFile(zip_filename, "w",
compression=zipfile.ZIP_DEFLATED)
os.path.walk(base_dir, visit, z)
z.close()
+ else:
+ os.path.walk(base_dir, visit, None)
return zip_filename
More information about the Python-checkins
mailing list