Subject: [patch] renaming BROKENWRKLOG to .broken.work.txt
To: None <pkgsrc-bulk@NetBSD.org>
From: Roland Illig <rillig@NetBSD.org>
List: pkgsrc-bulk
Date: 11/20/2005 18:02:09
This is a multi-part message in MIME format.
--------------020702070603060108030007
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Any objections against this patch? As opposed to the .broken.html file
we _never_ have HTML in this file, so I still don't understand why it's
enclosed in <pre> tags and converted to HTML.
One non-obvious change is that the BROKENWRKLOG file is overwritten each
time, instead of being appended. It is worth discussing whether the one
or the other behavior is actually preferred. I prefer the overwriting one.
NB: Please don't apply this patch _during_ a bulk build. :)
Roland
--------------020702070603060108030007
Content-Type: text/plain;
name="brokenwrklog.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="brokenwrklog.patch"
Index: bsd.bulk-pkg.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bulk/bsd.bulk-pkg.mk,v
retrieving revision 1.105
diff -u -p -r1.105 bsd.bulk-pkg.mk
--- bsd.bulk-pkg.mk 20 Nov 2005 09:52:51 -0000 1.105
+++ bsd.bulk-pkg.mk 20 Nov 2005 16:54:20 -0000
@@ -88,7 +88,7 @@ BULK_ID?=
BROKENFILE?= .broken${BULK_ID}.html
# This file is the work log for a broken package
-BROKENWRKLOG?= .broken${BULK_ID}.work.html
+BROKENWRKLOG?= .broken${BULK_ID}.work.txt
# This file is human-created to force a package to show up as broken
# (it is never cleaned by the bulk build, and contains the broken reason)
@@ -430,11 +430,7 @@ bulk-package:
else \
${MV} ${_BUILDLOG:Q} ${_BROKENFILE:Q} ;\
if [ -f "${WRKLOG}" ]; then \
- (${ECHO} "<pre>"; \
- ${ECHO} ""; \
- ${TO_HTML} ${WRKLOG}; \
- ${ECHO} "</pre>"; \
- ) >> ${_BROKENWRKLOG:Q}; \
+ ${CP} ${WRKLOG:Q} ${_BROKENWRKLOG:Q}; \
fi; \
( \
if [ -f "${_BROKENWRKLOG:Q}" ]; then \
--------------020702070603060108030007--