|
|
|
@ -287,10 +287,10 @@ class Runner(object):
|
|
|
|
|
def _compute_environment_string(self, inject=None):
|
|
|
|
|
''' what environment variables to use when running the command? '''
|
|
|
|
|
|
|
|
|
|
default_environment = collections.OrderedDict([
|
|
|
|
|
('LANG', C.DEFAULT_MODULE_LANG),
|
|
|
|
|
('LC_CTYPE', C.DEFAULT_MODULE_LANG),
|
|
|
|
|
])
|
|
|
|
|
default_environment = dict(
|
|
|
|
|
LANG = C.DEFAULT_MODULE_LANG,
|
|
|
|
|
LC_CTYPE = C.DEFAULT_MODULE_LANG,
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if self.environment:
|
|
|
|
|
enviro = template.template(self.basedir, self.environment, inject, convert_bare=True)
|
|
|
|
@ -301,7 +301,7 @@ class Runner(object):
|
|
|
|
|
|
|
|
|
|
result = ""
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
# *****************************************************
|
|
|
|
|