features: show version number of the Python interpreter

[bup.git] / lib / cmd / version-cmd.py

diff --git a/lib/cmd/version-cmd.py b/lib/cmd/version-cmd.py
index 20fd218c5fe83001436b4d6dec29836d18869184..bc1329c7cce8bf5c4ca230894ce1da3242b69d14 100755 (executable)
--- a/lib/cmd/version-cmd.py
+++ b/lib/cmd/version-cmd.py
@@ -9,65 +9,41 @@ for arg in "$@"; do
     arg_i=$((arg_i + 1))
 done
 # Here to end of preamble replaced during install
-bup_python="$(dirname "$0")/bup-python" || exit $?
+bup_python="$(dirname "$0")/../../config/bin/python" || exit $?
 exec "$bup_python" "$0"
 """
 # end of bup preamble
 
 from __future__ import absolute_import, print_function
-import re, sys
+import os.path, re, sys
+
+sys.path[:0] = [os.path.dirname(os.path.realpath(__file__)) + '/..']
 
 from bup import compat, options, version
+from bup.io import byte_stream
 
 version_rx = re.compile(r'^[0-9]+\.[0-9]+(\.[0-9]+)?(-[0-9]+-g[0-9abcdef]+)?$')
 
 optspec = """
-bup version [--date|--commit|--tag]
+bup version [--date|--commit]
 --
 date    display the date this version of bup was created
 commit  display the git commit id of this version of bup
-tag     display the tag name of this version.  If no tag is available, display the commit id
 """
 o = options.Options(optspec)
 opt, flags, extra = o.parse(compat.argv[1:])
 
 
-total = (opt.date or 0) + (opt.commit or 0) + (opt.tag or 0)
+total = (opt.date or 0) + (opt.commit or 0)
 if total > 1:
     o.fatal('at most one option expected')
 
-
-def version_date():
-    """Format bup's version date string for output."""
-    return version.DATE.split(' ')[0]
-
-
-def version_commit():
-    """Get the commit hash of bup's current version."""
-    return version.COMMIT
-
-
-def version_tag():
-    """Format bup's version tag (the official version number).
-
-    When generated from a commit other than one pointed to with a tag, the
-    returned string will be "unknown-" followed by the first seven positions of
-    the commit hash.
-    """
-    names = version.NAMES.strip()
-    assert(names[0] == '(')
-    assert(names[-1] == ')')
-    names = names[1:-1]
-    l = [n.strip() for n in names.split(',')]
-    for n in l:
-        if n.startswith('tag: ') and version_rx.match(n[5:]):
-            return n[5:]
-    return 'unknown-%s' % version.COMMIT[:7]
-
+sys.stdout.flush()
+out = byte_stream(sys.stdout)
 
 if opt.date:
-    print(version_date())
+    out.write(version.date.split(b' ')[0] + b'\n')
 elif opt.commit:
-    print(version_commit())
+    out.write(version.commit + b'\n')
 else:
-    print(version_tag())
+    out.write(version.version + b'\n')