Author: blues Date: Mon Dec 24 11:38:16 2007 GMT Module: pld-builder.new Tag: HEAD ---- Log message: - prevent race-condition and buildlogs vanishing (by witekfl)
---- Files affected: pld-builder.new/helpers: buildlogs-mover.conf (1.1 -> 1.2) , buildlogs-mover.sh (1.5 -> 1.6) ---- Diffs: ================================================================ Index: pld-builder.new/helpers/buildlogs-mover.conf diff -u pld-builder.new/helpers/buildlogs-mover.conf:1.1 pld-builder.new/helpers/buildlogs-mover.conf:1.2 --- pld-builder.new/helpers/buildlogs-mover.conf:1.1 Sat Aug 30 21:43:55 2003 +++ pld-builder.new/helpers/buildlogs-mover.conf Mon Dec 24 12:38:11 2007 @@ -1,3 +1,3 @@ # This is location of buildlogs tree: -root="/home/services/ftpd/pub/pld-buildlogs" +root="/home/services/ftp/pub/pld-buildlogs" ================================================================ Index: pld-builder.new/helpers/buildlogs-mover.sh diff -u pld-builder.new/helpers/buildlogs-mover.sh:1.5 pld-builder.new/helpers/buildlogs-mover.sh:1.6 --- pld-builder.new/helpers/buildlogs-mover.sh:1.5 Sat Feb 18 18:09:35 2006 +++ pld-builder.new/helpers/buildlogs-mover.sh Mon Dec 24 12:38:11 2007 @@ -15,6 +15,7 @@ # directories there. root="/home/services/ftpd/buildlogs" +ADDLOG="/home/services/httpd/html/pld-buildlogs/scripts/addlog.php" if test -f /etc/buildlogs-mover.conf ; then . /etc/buildlogs-mover.conf @@ -32,7 +33,6 @@ info="$1" info_val="$(cat "$info" 2>/dev/null)" if echo "$info_val" | grep -q '^END$' ; then - rm "$info" 2>/dev/null || return status=$(echo "$info_val" | grep '^Status:' | sed -e 's/.*: *//') case $status in OK ) s=OK ;; @@ -44,16 +44,20 @@ echo "#v+" 1>&2 echo "$info_val" 1>&2 echo "#v-" 1>&2 + rm "$info" 2>/dev/null return ;; esac archdir="$(dirname "$(dirname "$info")")" file=$(basename "$info" .info) - if test -f "$archdir/OK/$file" ; then - mv -f "$archdir/OK/$file" "$archdir/prevOK/$file" - fi - rm -f "$archdir/"{OK,FAIL}"/$file" - mv -f "$archdir/.new/$file" "$archdir/$s/$file" + if test -f "$archdir/.new/$file"; then + if test -f "$archdir/OK/$file" ; then + mv -f "$archdir/OK/$file" "$archdir/prevOK/$file" + fi + rm -f "$archdir/"{OK,FAIL}"/$file" + mv -f "$archdir/.new/$file" "$archdir/$s/$file" + $ADDLOG "$archdir/$s/$file" + rm "$info" 2>/dev/null fi } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/helpers/buildlogs-mover.conf?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/helpers/buildlogs-mover.sh?r1=1.5&r2=1.6&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit