svn commit: r376511 - head/Mk/Scripts
Bryan Drewery
bdrewery at FreeBSD.org
Thu Jan 8 03:55:01 UTC 2015
Author: bdrewery
Date: Thu Jan 8 03:55:00 2015
New Revision: 376511
URL: https://svnweb.freebsd.org/changeset/ports/376511
QAT: https://qat.redports.org/buildarchive/r376511/
Log:
- Rework check on $makeplist in parse_plist(). The variable was/is always 0 as
the makeplist code does not use parse_plist(). Rename the param to
'parse_comments' to be more clear on what it is for. This is kept for
upcoming refactoring.
With hat: portmgr
Modified:
head/Mk/Scripts/check-stagedir.sh
Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh Thu Jan 8 03:37:20 2015 (r376510)
+++ head/Mk/Scripts/check-stagedir.sh Thu Jan 8 03:55:00 2015 (r376511)
@@ -18,7 +18,9 @@ export LC_ALL=C
# Use file descriptors 1 and 3 so that the while loop can write
# files to the pipe and dirs to a separate file.
parse_plist() {
- local cwd cwd_save commented_cwd comment line newcwd
+ local cwd cwd_save commented_cwd comment line newcwd parse_comments
+
+ parse_comments="${1:-1}"
echo "===> Parsing plist"
cwd=${PREFIX}
@@ -30,7 +32,7 @@ parse_plist() {
# a @comment to deactive files. XXX: It would be better to
# make all ports use @ignore instead of @comment.
comment=
- if [ ${makeplist} -eq 0 -a -z "${line%%@comment *}" ]; then
+ if [ ${parse_comments} -eq 1 -a -z "${line%%@comment *}" ]; then
line="${line##*@comment }"
# Remove @comment so it can be parsed as a file,
# but later prepend it again to create a list of
More information about the svn-ports-head
mailing list