RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: mancoosi Date: 21-Mar-2011 01:23:56
Branch: HEAD Handle: 2011032100235500
Modified files:
mancoosi/buildbot Makefile
Log:
- avoid accidental firing on e.g slaves-start with %-start pattern
rule.
Summary:
Revision Changes Path
1.4 +11 -11 mancoosi/buildbot/Makefile
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: mancoosi/buildbot/Makefile
============================================================================
$ cvs diff -u -r1.3 -r1.4 Makefile
--- mancoosi/buildbot/Makefile 20 Mar 2011 23:27:50 -0000 1.3
+++ mancoosi/buildbot/Makefile 21 Mar 2011 00:23:55 -0000 1.4
@@ -89,7 +89,7 @@
H = localhost
P = 9989
HP = ${H}:${P}
-PW = $(shell cat .password)
+PW = PASSWORD # $(shell cat .password)
.PRECIOUS: ${slaves}
${slaves}:
@@ -99,18 +99,18 @@
.PRECIOUS: ${slaves}/%
${slaves}/%: ${slaves}
@echo "=== $@ ==="
- if [ ! -d $@ ]; then \
- mkdir -p $@; \
+ if true; then \
+ mkdir $@; \
cd $@; \
- ${buildbot} create-slave --usepty=1 --umask=022 $@ \
+ ${buildbot} create-slave --usepty=1 --umask=022 . \
${HP} $(@F)_install ${PW}; \
mv Makefile.sample Makefile; \
ls -l; \
fi
-%-start: ${slaves}/%
+%-Start: ${slaves}/%
@echo "=== $@ ==="
- if [ -d $< -a ! -e $</${pidfile} ]; then \
+ if true; then \
${twistd} --no_save \
--rundir $< \
--python $</buildbot.tac \
@@ -119,26 +119,26 @@
netstat -nat | grep ':8010'; \
fi
-%-stop: ${slaves}/%
+%-Stop: ${slaves}/%
@echo "=== $@ ==="
if [ -d $< -a -e $</${pidfile} ]; then \
kill `cat $</${pidfile}`; \
fi
-%-reconfig: ${slaves}/%
+%-Reconfig: ${slaves}/%
@echo "=== $@ ==="
if [ -d $< -a -e $</${pidfile} ]; then \
kill -HUP `cat $</${pidfile}`; \
fi
-%-log: ${slaves}/%
+%-Log: ${slaves}/%
@echo "=== $@ ==="
if [ -d $< -a -e $</${logfile} ]; then \
tail -f $</${logfile}; \
fi
-slaves-start: $(foreach nick, ${nicks}, ${nick}-start)
-slaves-stop: $(foreach nick, ${nicks}, ${nick}-stop)
+slaves-start: $(foreach nick, ${nicks}, ${nick}-Start)
+slaves-stop: $(foreach nick, ${nicks}, ${nick}-Stop)
slaves-create:: $(foreach nick, ${nicks}, ${slaves}/${nick})
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
