← Back to branch summary

~abompard/mailman/mailman-no-version-hardcoding

« back to all changes in this revision

Viewing changes to src/mailman/bin/master.py

  • Committer: Barry Warsaw
  • Date: 2015-01-05 01:13:33 UTC
  • Revision ID: barry@list.org-20150105011333-pvtj59nsekrwtnl7
Always pass the -C option to the subprocess.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mailman/bin/master.py
365
365
        # config.PYTHON, which is the absolute path to the Python interpreter,
366
366
        # must be given as argv[0] due to Python's library search algorithm.
367
367
        args = [sys.executable, sys.executable, exe, rswitch]
368
 
        if self._config_file is not None:
369
 
            args.extend(['-C', self._config_file])
 
368
        config_file = (config.filename if self._config_file is None
 
369
                       else self._config_file)
 
370
        args.extend(['-C', config_file])
370
371
        log = logging.getLogger('mailman.runner')
371
372
        log.debug('starting: %s', args)
372
373
        # For the testing framework, if this environment variable is set, pass