[Buildbot-commits] buildbot/buildbot/scripts runner.py,1.6,1.7

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13669/buildbot/scripts

Modified Files:
	runner.py 
Log Message:
* buildbot/scripts/runner.py (createMaster): use shutil.copy()
instead of the unix-specific os.system("cp"), thanks to Elliot
Murphy for this and the other buildbot-vs-windows catches.
* buildbot/test/test_maildir.py (MaildirTest.deliverMail): same

* contrib/windows/buildbot.bat: prefix a '@', apparently to not
echo the command as it is run

* setup.py: install sample.mk too, not just sample.cfg
(scripts): install contrib/windows/buildbot.bat on windows


Index: runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/runner.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- runner.py	14 Oct 2004 16:47:33 -0000	1.6
+++ runner.py	8 Nov 2004 09:03:21 -0000	1.7
@@ -1,6 +1,6 @@
 #! /usr/bin/python
 
-import os, os.path, sys
+import os, os.path, sys, shutil
 from twisted.python import usage, util
 
 # this is mostly just a front-end for mktap, twistd, and kill(1), but in the
@@ -38,8 +38,7 @@
         print "installing sample in master.cfg.sample instead"
         target = "master.cfg.sample"
     sampleconfig = util.sibpath(__file__, "sample.cfg")
-    cmd = "cp %s %s" % (sampleconfig, target)
-    os.system(cmd)
+    shutil.copy(sampleconfig, target)
 
     target = "Makefile"
     if os.path.exists(target):
@@ -47,8 +46,7 @@
         print "installing sample in Makefile.sample instead"
         target = "Makefile.sample"
     samplemk = util.sibpath(__file__, "sample.mk")
-    cmd = "cp %s %s" % (samplemk, target)
-    os.system(cmd)
+    shutil.copy(samplemk, target)
 
     if not quiet: print "buildmaster configured in %s" % basedir
     sys.exit(0)