@@ -11,6 +11,7 @@ /build-stamp /ChangeLog /cola.tuxfamily.org +/cola/builtin_version.py /configure-stamp /dist /debian/*.log .gitignore @@ -96,6 +96,7 @@ def version(): for v in [builtin_version, git_describe_version]: try: _version = v() + break except VersionUnavailable: pass if not _version: cola/version.py @@ -24,13 +24,10 @@ def main(): _check_git_version(git_version) _check_pyqt_version() _build_translations() # msgfmt: .po -> .qm - try: - if os.path.exists('.git'): - version.write_builtin_version() - _run_setup(git_version) - finally: - if os.path.exists('.git'): - version.delete_builtin_version() + + if os.path.exists('.git'): + version.write_builtin_version() + _run_setup(git_version) # restore the old mask os.umask(old_mask) setup.py d807842cc6a983e7f28e123f3f1813566a4843de David Aguilar davvid@gmail.com http://github.com/davvid/git-cola/commit/759a54c57425ef870461199b380692fa209dc667 759a54c57425ef870461199b380692fa209dc667 2009-10-31T13:19:17-07:00 2009-10-31T13:17:51-07:00 cola.version: Fix builtin_version usage We no longer remote builtin_version in setup.py. This allows us to find builtin_version when running cola from its source tree. We also break out of the loop when builtin_version is found which makes cola return the correct version number instead of always falling back to 'git describe'. Signed-off-by: David Aguilar <davvid@gmail.com> c5d6958470ac5e9fa55b00310d5597ab47e7982a David Aguilar davvid@gmail.com