summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2008-01-15 19:25:06 +0000
committerChristian Goetze <cg@lindenlab.com>2008-01-15 19:25:06 +0000
commit159d2d471f2dc0f4c723bce0199baf6988340f80 (patch)
treeeb6790036df67fede2f6d35d69a9be6266a7bd20
parente4b451015e73cefecaf9966afb56bdf623539c62 (diff)
Make update_version_files.py look in the environment for the location of
the svn executable, default to "svn" is not set.
-rwxr-xr-xscripts/update_version_files.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/update_version_files.py b/scripts/update_version_files.py
index 6821623332..fe914f3917 100755
--- a/scripts/update_version_files.py
+++ b/scripts/update_version_files.py
@@ -11,6 +11,9 @@ if exists(setup_path):
import getopt, sys, os, re, commands
from indra.util import llversion
+svn = os.path.expandvars("${SVN}")
+if not svn: svn = "svn"
+
def usage():
print "Usage:"
print sys.argv[0] + """ [options]
@@ -213,7 +216,7 @@ def main():
server_version = new_version
else:
# Assume we're updating just the build number
- cl = 'svn info "%s"' % src_root
+ cl = '%s info "%s"' % (svn, src_root)
status, output = _getstatusoutput(cl)
if verbose:
print