Commit deb532c3 by James Cammarata

Remove OrderedDict references from runner

Fixes #7256
parent c6f3a0a4
...@@ -287,10 +287,10 @@ class Runner(object): ...@@ -287,10 +287,10 @@ class Runner(object):
def _compute_environment_string(self, inject=None): def _compute_environment_string(self, inject=None):
''' what environment variables to use when running the command? ''' ''' what environment variables to use when running the command? '''
default_environment = collections.OrderedDict([ default_environment = dict(
('LANG', C.DEFAULT_MODULE_LANG), LANG = C.DEFAULT_MODULE_LANG,
('LC_CTYPE', C.DEFAULT_MODULE_LANG), LC_CTYPE = C.DEFAULT_MODULE_LANG,
]) )
if self.environment: if self.environment:
enviro = template.template(self.basedir, self.environment, inject, convert_bare=True) enviro = template.template(self.basedir, self.environment, inject, convert_bare=True)
...@@ -301,7 +301,7 @@ class Runner(object): ...@@ -301,7 +301,7 @@ class Runner(object):
result = "" result = ""
for (k,v) in default_environment.iteritems(): for (k,v) in default_environment.iteritems():
result = "%s %s=%s" % (result, k, pipes.quote(unicode(v))) result = "%s=%s %s" % (k, pipes.quote(unicode(v)), result)
return result return result
# ***************************************************** # *****************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment