Date: Wed, 4 Sep 2013 08:20:04 GMT From: "G. Paul Ziemba" <p-fbsd-bugs@ziemba.us> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/181799: ports-mgmt/poudriere: [PATCH] allow in-line comments in ports-list Message-ID: <201309040820.r848K4qe084923@oldred.freebsd.org> Resent-Message-ID: <201309040830.r848U0qe013878@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181799
>Category: ports
>Synopsis: ports-mgmt/poudriere: [PATCH] allow in-line comments in ports-list
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 04 08:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: G. Paul Ziemba
>Release: 9.1
>Organization:
>Environment:
FreeBSD hairball.ziemba.us 9.1-STABLE FreeBSD 9.1-STABLE #4 r249454: Sat Apr 13 22:31:42 PDT 2013 root@hairball:/usr/obj/usr/src/sys/GPZ-130412 amd64
>Description:
% poudriere version
3.0.4
The ports-list file for "bulk" seems to allow comments on lines by themselves, but does not allow comments on the same line as port names.
The attached patch allows a ports-list file to look like this:
# A comment on a line by itself
devel/patch # a comment on the same line as a port name
>How-To-Repeat:
sudo poudriere bulk -w -p portstree -j 91s-amd64 -f list-of-ports
>Fix:
Patch attached with submission follows:
--- src/share/poudriere/common.sh.orig 2013-08-03 10:47:22.000000000 -0700
+++ src/share/poudriere/common.sh 2013-09-04 00:48:58.000000000 -0700
@@ -2194,7 +2194,7 @@
fi
if [ -z "${LISTPORTS}" ]; then
[ -n "${LISTPKGS}" ] &&
- grep -h -v -E '(^[[:space:]]*#|^[[:space:]]*$)' ${LISTPKGS}
+ grep -h -v -E '(^[[:space:]]*#|^[[:space:]]*$)' ${LISTPKGS} | sed -e 's/[[:space:]]*#.*$//'
else
echo ${LISTPORTS} | tr ' ' '\n'
fi
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309040820.r848K4qe084923>