| 1 |
Author: agaffney |
| 2 |
Date: 2008-09-04 02:17:27 +0000 (Thu, 04 Sep 2008) |
| 3 |
New Revision: 568 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/tools/ChangeLog |
| 7 |
trunk/tools/catalyst-auto |
| 8 |
trunk/tools/catalyst-auto.conf |
| 9 |
Log: |
| 10 |
Remove globbing support as it can't guarantee ordering |
| 11 |
|
| 12 |
Modified: trunk/tools/ChangeLog |
| 13 |
=================================================================== |
| 14 |
--- trunk/tools/ChangeLog 2008-09-04 02:11:48 UTC (rev 567) |
| 15 |
+++ trunk/tools/ChangeLog 2008-09-04 02:17:27 UTC (rev 568) |
| 16 |
@@ -2,6 +2,10 @@ |
| 17 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 18 |
# $Id$ |
| 19 |
|
| 20 |
+ 04 Sep 2008; Andrew Gaffney <agaffney@g.o> catalyst-auto, |
| 21 |
+ catalyst-auto.conf: |
| 22 |
+ Remove globbing support as it can't guarantee ordering |
| 23 |
+ |
| 24 |
04 Sep 2008; Andrew Gaffney <agaffney@g.o> catalyst-auto: |
| 25 |
Add a bit of extra verbosity |
| 26 |
|
| 27 |
|
| 28 |
Modified: trunk/tools/catalyst-auto |
| 29 |
=================================================================== |
| 30 |
--- trunk/tools/catalyst-auto 2008-09-04 02:11:48 UTC (rev 567) |
| 31 |
+++ trunk/tools/catalyst-auto 2008-09-04 02:17:27 UTC (rev 568) |
| 32 |
@@ -115,7 +115,7 @@ |
| 33 |
|
| 34 |
cd ${SPECS_DIR} |
| 35 |
|
| 36 |
-for i in $(ls -1 ${SPECS}); do |
| 37 |
+for i in ${SPECS}; do |
| 38 |
cp --parents ${i} ${TMPDIR}/specs/ |
| 39 |
done |
| 40 |
|
| 41 |
@@ -139,7 +139,7 @@ |
| 42 |
send_email "Catalyst build error - snapshot" "$(tail -n 200 ${TMPDIR}/log/snapshot-${DATESTAMP}.log)" |
| 43 |
fi |
| 44 |
|
| 45 |
-for i in $(ls -1 ${SPECS}); do |
| 46 |
+for i in ${SPECS}; do |
| 47 |
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" |
| 48 |
run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} |
| 49 |
if [ $? != 0 ]; then |
| 50 |
|
| 51 |
Modified: trunk/tools/catalyst-auto.conf |
| 52 |
=================================================================== |
| 53 |
--- trunk/tools/catalyst-auto.conf 2008-09-04 02:11:48 UTC (rev 567) |
| 54 |
+++ trunk/tools/catalyst-auto.conf 2008-09-04 02:17:27 UTC (rev 568) |
| 55 |
@@ -2,8 +2,10 @@ |
| 56 |
# self-explanatory. |
| 57 |
|
| 58 |
SPECS_DIR=/release/svn-releng/trunk/releases/2008.0/specs/amd64 |
| 59 |
-SPECS="stage[123].spec installcd-stage[12]*.spec" |
| 60 |
-SPECS="${SPECS} stage[23]-desktop.spec livecd-stage[12]*.spec" |
| 61 |
+SPECS="stage1.spec stage2.spec stage3.spec" |
| 62 |
+SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec" |
| 63 |
+SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec" |
| 64 |
+SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec" |
| 65 |
|
| 66 |
#EMAIL_TO=releng@g.o |
| 67 |
EMAIL_TO=andrew@g.o |
Archives