diff options
| author | W. Trevor King <wking@drexel.edu> | 2010-06-22 19:05:19 -0400 |
|---|---|---|
| committer | W. Trevor King <wking@drexel.edu> | 2010-06-22 19:05:19 -0400 |
| commit | 74f1d681e8123833f22fbd0af751c9ebff85e530 (patch) | |
| tree | 706dde6e484ae63938691ab73a07155111e84c70 | |
| parent | 9763adba687a0e8921187702dd55e9a7083c9db4 (diff) | |
| download | bugseverywhere-74f1d681e8123833f22fbd0af751c9ebff85e530.tar.gz | |
Updated _version.py and version.py to work with Git
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | libbe/version.py | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -68,7 +68,7 @@ clean: .PHONY: libbe/_version.py libbe/_version.py: - bzr version-info --format python > $@ + git show --pretty='format:"Autogenerated by make libbe/_version.py"%nversion_info = {%n "date":"%ci",%n "revision":"%H",%n "committer":"%cn"}' > $@ .PHONY: man man: ${MANPAGE_FILES} diff --git a/libbe/version.py b/libbe/version.py index 2792de4..e1c5f1f 100644 --- a/libbe/version.py +++ b/libbe/version.py @@ -35,19 +35,19 @@ def version(verbose=False): """ Returns the version string for this BE installation. If verbose==True, the string will include extra lines with more - detail (e.g. bzr branch nickname, etc.). + detail (e.g. last committer's name, etc.). """ if "_VERSION" in globals(): string = _VERSION else: - string = _version.version_info["revision_id"] + string = _version.version_info['revision'] if verbose == True: info = copy.copy(_version.version_info) info['storage'] = libbe.storage.STORAGE_VERSION string += ("\n" - "revision: %(revno)d\n" - "nick: %(branch_nick)s\n" - "revision id: %(revision_id)s\n" + "revision: %(revision)s\n" + "date: %(date)s\n" + "committer: %(committer)s\n" "storage version: %(storage)s" % info) return string |