1 files changed, 14 insertions, 4 deletions
diff --git a/admin/bin/Release.py b/admin/bin/Release.py
index 0ee3d12e4..cfdb24910 100755
--- a/admin/bin/Release.py
+++ b/admin/bin/Release.py
@@ -52,6 +52,7 @@ Where `options' are:
 import sys
 import os
 import string
+import errno
 import re
 import time
 import tempfile
@@ -167,10 +168,8 @@ def do_bump(newvers):
 
 def main():
     try:
-	opts, args = getopt.getopt(
-	    sys.argv[1:],
-	    'btTph',
-	    ['bump', 'tag', 'TAG', 'package', 'help'])
+	opts, args = getopt.getopt(sys.argv[1:], 'btTph',
+                                   ['bump', 'tag', 'TAG', 'package', 'help'])
     except getopt.error, msg:
 	usage(1, msg)
 
@@ -180,6 +179,17 @@ def main():
 
     tagname = args[0]
 
+    # We need a $CVSROOT
+    if not os.environ.get('CVSROOT'):
+        try:
+            fp = open('CVS/Root')
+            os.environ['CVSROOT'] = string.strip(fp.read())
+            fp.close()
+        except IOError, e:
+            if e.errno <> errno.ENOENT: raise
+            usage(1, 'CVSROOT is not set and could not be guessed')
+    print 'Using CVSROOT:', os.environ['CVSROOT']
+
     # default options
     tag = 0
     retag = 0