Move 'buildbot.tac' and 'buildbot' files to a common directory.

third_party/buildbot_8_4p1/buildbot/scripts/runner.py

 # This file is part of Buildbot.  Buildbot is free software: you can
 # redistribute it and/or modify it under the terms of the GNU General Public
 # License as published by the Free Software Foundation, version 2.
 #
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
 # details.
 #
 # You should have received a copy of the GNU General Public License along with
@@ skipping 29 matching lines @@
             def do_stop(r):
                 result.append(r)
                 reactor.stop()
             d.addBoth(do_stop)
         reactor.callWhenRunning(async)
         reactor.run()
         return result[0]
     return wrap
 
 def isBuildmasterDir(dir):
-    buildbot_tac = os.path.join(dir, "buildbot.tac")
+    buildbot_tac = os.path.join(dir, "master.cfg")
     if not os.path.isfile(buildbot_tac):
-        print "no buildbot.tac"
+        print "no master.cfg"
         return False
 
     contents = open(buildbot_tac, "r").read()
     return "Application('buildmaster')" in contents
 
 # the create/start/stop commands should all be run as the same user,
 # preferably a separate 'buildbot' account.
 
 # Note that the terms 'options' and 'config' are used intechangeably here - in
 # fact, they are intercanged several times.  Caveat legator.
@@ skipping 245 matching lines @@
             old_contents = open(target, "rt").read()
             if old_contents != new_contents:
                 if overwrite:
                     if not self.quiet:
                         print "%s has old/modified contents" % target
                         print " overwriting it with new contents"
                     open(target, "wt").write(new_contents)
                 else:
                     if not self.quiet:
                         print "%s has old/modified contents" % target
-                        print " writing new contents to %s.new" % target
-                    open(target + ".new", "wt").write(new_contents)
             # otherwise, it's up to date
         else:
             if not self.quiet:
                 print "populating %s" % target
             open(target, "wt").write(new_contents)
 
     def move_if_present(self, source, dest):
         if os.path.exists(source):
             if os.path.exists(dest):
                 print "Notice: %s now overrides %s" % (dest, source)
@@ skipping 920 matching lines @@
         statusgui(so)
     elif command == "try":
         doTry(so)
     elif command == "tryserver":
         doTryServer(so)
     elif command == "checkconfig":
         if not doCheckConfig(so):
             sys.exit(1)
     sys.exit(0)