summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Goetze <cg@lindenlab.com>2009-08-20 21:16:18 +0000
committerChristian Goetze <cg@lindenlab.com>2009-08-20 21:16:18 +0000
commit87be6648d50efc55785e2298a9ed6ec0546da564 (patch)
tree8073ba563532b2c0656af5818e230db7f1473b33
parent06b079a24b743088ca51eea1a627f0b4e1722458 (diff)
Applied path from "[sldev-commits] r2604 - projects/2009/snowglobe/trunk/indra/newview"
-rw-r--r--indra/newview/build_win32_appConfig.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/build_win32_appConfig.py b/indra/newview/build_win32_appConfig.py
index 2ac0e17dc1..fb6a0258bc 100644
--- a/indra/newview/build_win32_appConfig.py
+++ b/indra/newview/build_win32_appConfig.py
@@ -28,7 +28,7 @@
# COMPLETENESS OR PERFORMANCE.
# $/LicenseInfo$
-import sys, os
+import sys, os, re
from xml.dom.minidom import parse
def main():
@@ -43,7 +43,8 @@ def main():
config_dom = parse(src_config_name)
node = config_dom.getElementsByTagName('bindingRedirect')[0]
node.setAttribute('newVersion', manifest_assm_ver)
- node.setAttribute('oldVersion', node.getAttribute('oldVersion') + manifest_assm_ver)
+ src_old_ver = re.match('([^-]*-).*', node.getAttribute('oldVersion')).group(1)
+ node.setAttribute('oldVersion', src_old_ver + manifest_assm_ver)
comment = config_dom.createComment("This file is automatically generated by the build. see indra/newview/build_win32_appConfig.py")
config_dom.insertBefore(comment, config_dom.childNodes[0])