Changeset 35254d1 in nscp for build/python/postbuild.py

Timestamp:

01/15/12 23:32:36 (17 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

89838be

Parents:

ba63b95

Message:

• Fixed installer "back" issues
• Fixed payload truncation for NRPe and NSCA
• Improved the installer target tagging functions in the python installer

File:

• build/python/postbuild.py (modified) (3 diffs)

build/python/postbuild.py

@@ -16 +16 @@
 vstring = version.version()
 
+targets = None
+
+def build_targets(str):
+  targets = {}
+  for itm in str.split(';'):
+    tmp = itm.split('=')
+    if len(tmp) == 0:
+      continue
+    elif len(tmp) == 1:
+      targets['nscp'] = tmp[0]
+    else:
+      targets[tmp[0]] = tmp[1]
+  return targets
+      
+  
+    
+def find_target(key=None):
+  global targets
+  if not targets:
+    targets = build_targets(TARGET_SITE)
+  if not key:
+    key = 'nscp'
+  if not key in targets:
+    return None
+  return targets[key]
+
+
 def scp_file(file):
   tfile = os.path.basename(file)
@@ -22 +49 @@
   if '_' in name:
     (name, tag) = name.split('_')
-    if globals().has_key('TARGET_SITE_%s'%tag):
-      target = globals().get('TARGET_SITE_%s'%tag)
+    target = find_target(tag)
+    if target:
       print 'Found tagged installer %s for %s'%(tfile, tag)
     else:
@@ -29 +56 @@
   else:
     print 'Found normal installer %s'%tfile
-    target = TARGET_SITE
+    target = find_target()
   if target:
     print 'Uploading name: %s to %s'%(tfile, target)