Add version qualifier to differentiate releases and development ones

It is always good to see which version we're talking about, so I had
added explicit marker for -devel, -release, -rcX and other states of
the OfflineIMAP.

Signed-off-by: Eygene Ryabinkin <rea@codelabs.ru>
This commit is contained in:
Eygene Ryabinkin 2014-06-01 22:32:57 +04:00
parent e8db1217d4
commit c92c4e56a0
5 changed files with 11 additions and 6 deletions

View File

@ -12,6 +12,9 @@ OfflineIMAP v6.5.6.1 (YYYY-MM-DD)
X-OfflineIMAP was added with preceeding '\n' instead of
'\r\n' just before message was uploaded to the IMAP server.
* Add missing version bump for 6.5.6 (it was released with
6.5.5 in setup.py and other places).
OfflineIMAP v6.5.6 (2014-05-14)
===============================

View File

@ -1,13 +1,15 @@
__all__ = ['OfflineImap']
__productname__ = 'OfflineIMAP'
__version__ = "6.5.5"
__version__ = "6.5.6.1"
__revision__ = "-devel"
__bigversion__ = __version__ + __revision__
__copyright__ = "Copyright 2002-2013 John Goerzen & contributors"
__author__ = "John Goerzen"
__author_email__= "john@complete.org"
__description__ = "Disconnected Universal IMAP Mail Synchronization/Reader Support"
__license__ = "Licensed under the GNU GPL v2+ (v2 or any later version)"
__bigcopyright__ = """%(__productname__)s %(__version__)s
__bigcopyright__ = """%(__productname__)s %(__bigversion__)s
%(__license__)s""" % locals()
__homepage__ = "http://offlineimap.org"

View File

@ -50,7 +50,7 @@ class OfflineImap:
self.__sync(options)
def __parse_cmd_options(self):
parser = OptionParser(version=offlineimap.__version__,
parser = OptionParser(version=offlineimap.__bigversion__,
description="%s.\n\n%s" %
(offlineimap.__copyright__,
offlineimap.__license__))

View File

@ -576,7 +576,7 @@ class Blinkenlights(UIBase, CursesUtil):
self.bannerwin.clear() # Delete old content (eg before resizes)
self.bannerwin.bkgd(' ', color) # Fill background with that color
string = "%s %s" % (offlineimap.__productname__,
offlineimap.__version__)
offlineimap.__bigversion__)
self.bannerwin.addstr(0, 0, string, color)
self.bannerwin.addstr(0, self.width -len(offlineimap.__copyright__) -1,
offlineimap.__copyright__, color)

View File

@ -95,7 +95,7 @@ class UIBase(object):
# write out more verbose initial info blurb on the log file
p_ver = ".".join([str(x) for x in sys.version_info[0:3]])
msg = "OfflineImap %s starting...\n Python: %s Platform: %s\n "\
"Args: %s" % (offlineimap.__version__, p_ver, sys.platform,
"Args: %s" % (offlineimap.__bigversion__, p_ver, sys.platform,
" ".join(sys.argv))
self.logger.info(msg)
@ -409,7 +409,7 @@ class UIBase(object):
#TODO: Debug and make below working, it hangs Gmail
#res_type, response = conn.id((
# 'name', offlineimap.__productname__,
# 'version', offlineimap.__version__))
# 'version', offlineimap.__bigversion__))
#self._msg("Server ID: %s %s" % (res_type, response[0]))
self._msg("Server welcome string: %s" % str(conn.welcome))
self._msg("Server capabilities: %s\n" % str(conn.capabilities))