summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsetuptools.txt3
-rwxr-xr-xsetuptools/command/egg_info.py8
2 files changed, 7 insertions, 4 deletions
diff --git a/setuptools.txt b/setuptools.txt
index e4ce6366..f478b82c 100755
--- a/setuptools.txt
+++ b/setuptools.txt
@@ -2010,6 +2010,9 @@ Release Notes/Change History
automatically include any package data listed in revision control or
``MANIFEST.in``.
+ * Fixed ``--tag-svn-revision`` not working when run from a source
+ distribution.
+
0.6a8
* Fixed some problems building extensions when Pyrex was installed, especially
with Python 2.4 and/or packages using SWIG.
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 3f17c041..a245002e 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -133,11 +133,11 @@ class egg_info(Command):
version = self.distribution.get_version()
if self.tag_build:
version+=self.tag_build
- if self.tag_svn_revision and os.path.exists('.svn'):
- version += '-r%s' % self.get_svn_revision()
+ if self.tag_svn_revision and (
+ os.path.exists('.svn') or os.path.exists('PKG-INFO')
+ ): version += '-r%s' % self.get_svn_revision()
if self.tag_date:
- import time
- version += time.strftime("-%Y%m%d")
+ import time; version += time.strftime("-%Y%m%d")
return safe_version(version)
def get_svn_revision(self):