accept either flux-broker or lt-flux-broker prefix on TMPDIR line in …

…sideflux
flux-framework · Jul 17, 2015 · 6cd1fa1 · 6cd1fa1
1 parent 5f31d58
commit 6cd1fa1
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/bindings/python/test_commands/sideflux.py b/src/bindings/python/test_commands/sideflux.py
@@ -76,13 +76,13 @@ def start(self):
                     if re.search(r'/\.\./', v):
                         v = os.path.abspath(v)
                     self.env_items[m.group(1)] = v
-                m = re.match(r'lt-flux-broker: FLUX_TMPDIR: (.*)',
+                m = re.match(r'(lt-)?flux-broker: FLUX_TMPDIR: (?P<path>.*)',
                              line.rstrip())
                 if m:
                     if os.environ.get('SIDEFLUX_DEBUG', False):
                         print("setting", "FLUX_TMPDIR", "to",
-                              os.path.abspath(m.group(1)))
-                    v = m.group(1)
+                              os.path.abspath(m.group('path')))
+                    v = m.group('path')
                     if re.search(r'/\.\./', v):
                         v = os.path.abspath(v)
                     self.env_items['FLUX_TMPDIR'] = v