Ran update-copyright.py.

[be.git] / libbe / version.py

diff --git a/libbe/version.py b/libbe/version.py
index 2792de4583626933ba2bbdf9c050cb602ee39c55..91818f4f1759d9b63adc37df2d1962d0b1050855 100644 (file)
--- a/libbe/version.py
+++ b/libbe/version.py
@@ -1,19 +1,22 @@
 #!/usr/bin/env python
-# Copyright (C) 2009-2010 W. Trevor King <wking@drexel.edu>
+# Copyright (C) 2009-2012 Chris Ball <cjb@laptop.org>
+#                         Gianluca Montecchi <gian@grys.it>
+#                         W. Trevor King <wking@tremily.us>
 #
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# This file is part of Bugs Everywhere.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Bugs Everywhere is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the Free
+# Software Foundation, either version 2 of the License, or (at your option) any
+# later version.
 #
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# Bugs Everywhere is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# Bugs Everywhere.  If not, see <http://www.gnu.org/licenses/>.
 
 """
 Store version info for this BE installation.  By default, use the
@@ -25,29 +28,38 @@ over the version strings" workflows.
 
 import copy
 
-import libbe._version as _version
 import libbe.storage
+try:
+    from ._version import version_info    
+except ImportError, e:
+    import logging
+    logging.warn('unable to import libbe._version: %s' % e)
+    version_info = {
+        'revision': 'unknown',
+        'date': 'unknown',
+        'committer': 'unknown',
+        }
 
 # Manually set a version string (optional, defaults to bzr revision id)
-#_VERSION = "1.2.3"
+_VERSION = '1.0.0'
 
 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_info['revision']
     if verbose == True:
-        info = copy.copy(_version.version_info)
+        info = copy.copy(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