Author: glen Date: Fri Feb 12 13:19:30 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- update get-buildlog to fetch recent log with new buildlogs site with build ids
- exclude scm dirs in dif(1)
---- Files affected:
packages/rpm-build-macros:
rpm-build.sh (1.60 -> 1.61)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm-build.sh
diff -u packages/rpm-build-macros/rpm-build.sh:1.60
packages/rpm-build-macros/rpm-build.sh:1.61
--- packages/rpm-build-macros/rpm-build.sh:1.60 Tue Feb 9 14:41:28 2010
+++ packages/rpm-build-macros/rpm-build.sh Fri Feb 12 14:19:24 2010
@@ -129,26 +129,31 @@
return
fi
- local al
+ local archlist
case "$dist" in
ac)
- al='i686,i586,i386,athlon,alpha,sparc,amd64,ppc'
+ archlist='i686 i586 i386 athlon alpha sparc amd64 ppc'
;;
th)
- al='x86_64,athlon,i486,i686,ppc'
+ archlist='x86_64 i486 i686'
;;
*)
echo >&2 "get-buildlog: $dist buildlogs are /dev/null"
return
esac
- local u a s=ftp://buildlogs.pld-linux.org
- for u in `eval echo $s/$dist/{$al}/{OK,FAIL}/$p.bz2`; do
- a=${u#$s/$dist/}; a=${a%%/*}
- echo -n "Fetching $u... "
- if wget -q $u -O .$p~; then
+ local url arch ftp=ftp://buildlogs.pld-linux.org
+ for arch in $archlist; do
+ [ "$arch" ] || continue
+ path=${url#$ftp}
+ echo -n "Checking $p.$arch... "
+ url=$(lftp -c "debug 0;open $ftp; cls --sort=date -r
/$dist/$arch/OK/$p,*.bz2 /$dist/$arch/FAIL/$p,*.bz2 | tail -n1")
+ url=$ftp$url
+
+ echo -n "$url... "
+ if wget -q $url -O .$p~; then
echo "OK"
- mv -f .$p~ $p.$a.bz2
+ mv -f .$p~ $p.$arch.bz2
else
echo "SKIP"
rm -f .$p~
@@ -238,9 +243,9 @@
dif() {
if [ -t 1 ]; then
- diff -ur "$@" | diffcol | less -R
+ diff -ur -x .svn -x .git -x .bzr -x CVS "$@" | diffcol | less -R
else
- diff -ur "$@"
+ diff -ur -x .svn -x .git -x .bzr -x CVS "$@"
fi
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build.sh?r1=1.60&r2=1.61&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
