[Buildbot-commits] [buildbot/buildbot] 4ea0e5: Rework locating config file for checkconfig and up...

[GitHub]

  Branch: refs/heads/buildbot-0.8.8
  Home:   https://github.com/buildbot/buildbot
  Commit: 4ea0e5fd6c579d6b85421a774ea00efa731c2e1a
      https://github.com/buildbot/buildbot/commit/4ea0e5fd6c579d6b85421a774ea00efa731c2e1a
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-06-06 (Thu, 06 Jun 2013)

  Changed paths:
    M master/buildbot/scripts/base.py
    M master/buildbot/scripts/checkconfig.py
    M master/buildbot/scripts/upgrade_master.py
    M master/buildbot/test/unit/test_scripts_base.py
    M master/buildbot/test/unit/test_scripts_checkconfig.py

  Log Message:
  -----------
  Rework locating config file for checkconfig and upgrade-master.

This changes the logic of checkconfig so that,
1. If a file is passed, that file is used.
2. If a directory is passed containing `buildbot.tac`, that file is
   loaded and `configfile` is defined there, that file is used.
3. If `buildbot.tac` doesn't exist, or doesn't define `configfile`,
   `master.cfg` from that directory is used.

The logic for upgrade-master is similar, except only directories are
supported, so (1) is skipped.


  Commit: 18533b22faba8e69246e65e54e7cee0e0466621d
      https://github.com/buildbot/buildbot/commit/18533b22faba8e69246e65e54e7cee0e0466621d
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M master/buildbot/scripts/checkconfig.py
    M master/buildbot/scripts/upgrade_master.py
    M master/buildbot/test/unit/test_scripts_checkconfig.py

  Log Message:
  -----------
  Report `SyntaxError` or `ImportError` from `checkconfig` and `upgrade-master`.


  Commit: 479ab7f275d96b1814db93a2e69e70033b5fefc0
      https://github.com/buildbot/buildbot/commit/479ab7f275d96b1814db93a2e69e70033b5fefc0
  Author: Tom Prince <tom.prince at ualberta.net>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M master/buildbot/scripts/base.py
    M master/buildbot/scripts/checkconfig.py
    M master/buildbot/scripts/upgrade_master.py
    M master/buildbot/test/unit/test_scripts_base.py
    M master/buildbot/test/unit/test_scripts_checkconfig.py

  Log Message:
  -----------
  Merge 'locate-config': Rework locating config file for checkconfig and upgrade-master.

This changes the logic of checkconfig so that,
1. If a file is passed, that file is used.
2. If a directory is passed containing buildbot.tac, that file is
loaded and configfile is defined there, that file is used.
3. If buildbot.tac doesn't exist, or doesn't define configfile,
master.cfg from that directory is used.

The logic for upgrade-master is similar, except only directories are
supported, so (1) is skipped.


Compare: https://github.com/buildbot/buildbot/compare/6b06d23eb425...479ab7f275d9