[Python-checkins] distutils2: merge

Sun Jan 30 14:49:25 CET 2011

tarek.ziade pushed ce8f067c392a to distutils2:
http://hg.python.org/distutils2/rev/ce8f067c392a
changeset: 975:ce8f067c392a
parent: 971:577f6269464e
parent: 974:201fa9f427bb
user: Alexis Metaireau <alexis at notmyidea.org>
date: Sun Jan 30 12:53:52 2011 +0100
summary:
 merge
files:

diff --git a/distutils2/mkcfg.py b/distutils2/mkcfg.py
--- a/distutils2/mkcfg.py
+++ b/distutils2/mkcfg.py
@@ -266,23 +266,25 @@
 data['packages'].extend(dist.packages or [])
 data['modules'].extend(dist.py_modules or [])
 # 2.1 data_files -> resources.
- if len(dist.data_files) < 2 or isinstance(dist.data_files[1], str):
- dist.data_files = [('', dist.data_files)]
- #add tokens in the destination paths
- vars = {'distribution.name':data['name']}
- path_tokens = sysconfig.get_paths(vars=vars).items()
- #sort tokens to use the longest one first
- path_tokens.sort(cmp=lambda x,y: cmp(len(y), len(x)),
- key=lambda x: x[1])
- for dest, srcs in (dist.data_files or []):
- dest = os.path.join(sys.prefix, dest)
- for tok, path in path_tokens:
- if dest.startswith(path):
- dest = ('{%s}' % tok) + dest[len(path):]
- files = [('/ '.join(src.rsplit('/', 1)), dest) 
- for src in srcs]
- data['resources'].extend(files)
- continue
+ if dist.data_files:
+ if len(dist.data_files) < 2 or \
+ isinstance(dist.data_files[1], str):
+ dist.data_files = [('', dist.data_files)]
+ #add tokens in the destination paths
+ vars = {'distribution.name':data['name']}
+ path_tokens = sysconfig.get_paths(vars=vars).items()
+ #sort tokens to use the longest one first
+ path_tokens.sort(cmp=lambda x,y: cmp(len(y), len(x)),
+ key=lambda x: x[1])
+ for dest, srcs in (dist.data_files or []):
+ dest = os.path.join(sys.prefix, dest)
+ for tok, path in path_tokens:
+ if dest.startswith(path):
+ dest = ('{%s}' % tok) + dest[len(path):]
+ files = [('/ '.join(src.rsplit('/', 1)), dest) 
+ for src in srcs]
+ data['resources'].extend(files)
+ continue
 # 2.2 package_data -> extra_files
 package_dirs = dist.package_dir or {}
 for package, extras in dist.package_data.iteritems() or []:
--
Repository URL: http://hg.python.org/distutils2
