← Back to branch summary

~checkbox-dev/checkbox/trunk

« back to all changes in this revision

Viewing changes to plainbox/plainbox/impl/ctrl.py

  • Committer: Daniel Manrique
  • Author(s): Zygmunt Krynicki
  • Date: 2014-06-11 17:01:58 UTC
  • mfrom: (3062.2.4 launchpad/fix-1328903)
  • Revision ID: daniel_manrique-20140611170158-x4257ca35qmzcqmn
"automatic merge by tarmac [r=roadmr][bug=1328903][author=zkrynicki]"

Show diffs side-by-side

added added

removed removed

Lines of Context:
plainbox/plainbox/impl/ctrl.py
512
512
        """
513
513
        # Get a proper environment
514
514
        env = dict(os.environ)
515
 
        # Use non-internationalized environment
516
 
        env['LANG'] = 'C.UTF-8'
517
 
        if 'LANGUAGE' in env:
518
 
            del env['LANGUAGE']
519
 
        for name in list(env.keys()):
520
 
            if name.startswith("LC_"):
521
 
                del env[name]
 
515
        # Neuter locale unless 'preserve-locale' flag is set
 
516
        if 'preserve-locale' not in job.get_flag_set():
 
517
            # Use non-internationalized environment
 
518
            env['LANG'] = 'C.UTF-8'
 
519
            if 'LANGUAGE' in env:
 
520
                del env['LANGUAGE']
 
521
            for name in list(env.keys()):
 
522
                if name.startswith("LC_"):
 
523
                    del env[name]
522
524
        # Use PATH that can lookup checkbox scripts
523
525
        if job.provider.extra_PYTHONPATH:
524
526
            env['PYTHONPATH'] = os.pathsep.join(