diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-19 08:56:21 -0500 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-19 08:56:21 -0500 |
commit | 48b0d2bfbd4aee6cc34ae6656d7c7033298f5ac0 (patch) | |
tree | 4ee14a28708fdaf3c3cf8fe42a84ba69f20777f6 /setuptools/command/egg_info.py | |
parent | 5d9d3930f400a754f38be2a4de21a7f9ed00f5f4 (diff) | |
parent | aa2269f68c8708f6498300f7d0a93a3a5eba562f (diff) | |
download | external_python_setuptools-48b0d2bfbd4aee6cc34ae6656d7c7033298f5ac0.tar.gz external_python_setuptools-48b0d2bfbd4aee6cc34ae6656d7c7033298f5ac0.tar.bz2 external_python_setuptools-48b0d2bfbd4aee6cc34ae6656d7c7033298f5ac0.zip |
Merge with 0.7.40.8b2
Diffstat (limited to 'setuptools/command/egg_info.py')
-rwxr-xr-x | setuptools/command/egg_info.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index ae14bb54..642687b2 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -211,7 +211,8 @@ class egg_info(Command): - def get_svn_revision(self): + @staticmethod + def get_svn_revision(): revision = 0 urlre = re.compile('url="([^"]+)"') revre = re.compile('committed-rev="(\d+)"') @@ -231,11 +232,11 @@ class egg_info(Command): else: try: svnver = int(data.splitlines()[0]) except: svnver=-1 - if data<8: + if svnver<8: log.warn("unrecognized .svn/entries format; skipping %s", base) dirs[:] = [] continue - + data = list(map(str.splitlines,data.split('\n\x0c\n'))) del data[0][0] # get rid of the '8' or '9' or '10' dirurl = data[0][3] |