Don't use $Id or $Rev for version strings since that doesn't work with git.

diff --git a/bin/etc-update b/bin/etc-update
index 03fef8d18e1c87999e3d0e5603d2887ba6c76e0e..d18afa33a939473289ccca43eb1952b64e1322c5 100755 (executable)
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -487,7 +487,7 @@ while [[ -n $1 ]] ; do
        case $1 in
                -d|--debug)   SET_X=true;;
                -h|--help)    usage;;
-               -V|--version) echo '$Id$'; exit 0;;
+               -V|--version) emerge --version ; exit 0;;
                *)            usage 1 "Invalid option '$1'";;
        esac
        shift

diff --git a/bin/portageq b/bin/portageq
index 8d6c12e23f8551ceea5600c182eddf9e12c4e096..7f146aaf70a18114325061d358f6885ec0fcf77a 100755 (executable)
--- a/bin/portageq
+++ b/bin/portageq
@@ -570,7 +570,7 @@ list_preserved_libs.uses_root = True
 
 def usage(argv):
        print(">>> Portage information query tool")
-       print(">>> $Id$")
+       print(">>> %s" % portage.VERSION)
        print(">>> Usage: portageq <command> [<option> ...]")
        print("")
        print("Available commands:")

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 685078728680af894f22f9ac2ad065bb716f5cab..6f5268ae94b3f2e182baf8accc8c1756d0a571be 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3,7 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-VERSION="$Rev$"[6:-2] + "-svn"
+VERSION="HEAD"
 
 # ===========================================================================
 # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT