svn commit: r220991 - in projects/portbuild: qmanager scripts sources

[Florent Thoumie]

Author: flz
Date: Sun Apr 24 15:59:54 2011
New Revision: 220991
URL: http://svn.freebsd.org/changeset/base/220991

Log:
  Cleanup:
  - allgohans.safe is a superset of allgohans, so rename it.
  - reportload.sh is obsolete as reportload is called via inetd.
  - checkmachines' loop is now part of pollmachine.
  - retcode belongs to qmanager.
  - dopackages2 is abandoned.
  - move pnohang and ptimeout sources to a separate directory.
  - make prunebad and zexpire executable.

Added:
  projects/portbuild/qmanager/retcodes
     - copied, changed from r220976, projects/portbuild/scripts/retcodes
  projects/portbuild/sources/
  projects/portbuild/sources/pnohang.c
     - copied, changed from r220976, projects/portbuild/scripts/pnohang.c
  projects/portbuild/sources/ptimeout.c
     - copied, changed from r220976, projects/portbuild/scripts/ptimeout.c
Deleted:
  projects/portbuild/scripts/allgohans.safe
  projects/portbuild/scripts/checkmachines
  projects/portbuild/scripts/checkmachines.sh
  projects/portbuild/scripts/dopackages2
  projects/portbuild/scripts/pnohang.c
  projects/portbuild/scripts/ptimeout.c
  projects/portbuild/scripts/reportload.sh
  projects/portbuild/scripts/retcodes
  projects/portbuild/scripts/showrunning
Modified:
  projects/portbuild/scripts/allgohans
  projects/portbuild/scripts/do-cleanup-chroots
  projects/portbuild/scripts/prunebad   (contents, props changed)
  projects/portbuild/scripts/zexpire   (contents, props changed)

Copied and modified: projects/portbuild/qmanager/retcodes (from r220976, projects/portbuild/scripts/retcodes)
==============================================================================

Modified: projects/portbuild/scripts/allgohans
==============================================================================
--- projects/portbuild/scripts/allgohans	Sun Apr 24 15:53:57 2011	(r220990)
+++ projects/portbuild/scripts/allgohans	Sun Apr 24 15:59:54 2011	(r220991)
@@ -21,7 +21,11 @@ doarch() {
 	if [ ${quiet} -eq 0 ]; then
 	    echo "[$i]"
 	fi
-	su ports-${arch} -c "ssh ${client_user}@$i ${sudo_cmd} $@"
+	lockf -t 60 ${pb}/${arch}/lockfiles/lock.$i su ports-${arch} -c "ssh ${client_user}@$i ${sudo_cmd} $@"
+	result=$?
+	if [ $result -ne 0 ]; then
+	    echo "could not execute command $@ on $i: $result"
+	fi
     done
 }
 

Modified: projects/portbuild/scripts/do-cleanup-chroots
==============================================================================
--- projects/portbuild/scripts/do-cleanup-chroots	Sun Apr 24 15:53:57 2011	(r220990)
+++ projects/portbuild/scripts/do-cleanup-chroots	Sun Apr 24 15:59:54 2011	(r220991)
@@ -2,10 +2,4 @@
 # 
 # clean up stale chroots on all client machines.  MCL 20081216.
 #
-# original version from root crontab:
-#
-#/var/portbuild/scripts/allgohans all -q /var/portbuild/scripts/cleanup-chroots
-#
-# new code:
-#
-/var/portbuild/scripts/allgohans.safe all -q /var/portbuild/scripts/cleanup-chroots
+/var/portbuild/scripts/allgohans all -q /var/portbuild/scripts/cleanup-chroots

Modified: projects/portbuild/scripts/prunebad
==============================================================================

Modified: projects/portbuild/scripts/zexpire
==============================================================================

Copied and modified: projects/portbuild/sources/pnohang.c (from r220976, projects/portbuild/scripts/pnohang.c)
==============================================================================

Copied and modified: projects/portbuild/sources/ptimeout.c (from r220976, projects/portbuild/scripts/ptimeout.c)
==============================================================================