Date: Tue, 15 Jan 2013 09:59:42 GMT From: Alex Kozlov <spam@rm-rf.kiev.ua> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/175317: [patch] ports-mgmt/portlint add new OPTIONS_* to @options_early; add check for space after WWW Message-ID: <201301150959.r0F9xgub097767@red.freebsd.org> Resent-Message-ID: <201301151000.r0FA00EU058015@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175317
>Category: ports
>Synopsis: [patch] ports-mgmt/portlint add new OPTIONS_* to @options_early; add check for space after WWW
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 15 10:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Alex Kozlov
>Release: RELENG_9
>Organization:
private
>Environment:
>Description:
- Remove unused PL_CVS_IGNORE
- Add check for a single space after WWW: in pkg-descr
- Clarify 'Created by:' warning message
- Add new OPTIONS_* knobs to @options_early
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
- Remove unused PL_CVS_IGNORE
- Add check for a single space after WWW: in pkg-descr
- Clarify 'Created by:' warning message
- Add new OPTIONS_* knobs to @options_early
Index: portlint
@@ -161,7 +161,6 @@
# The PORTSDIR environment variable overrides our defaults.
$portsdir = $ENV{PORTSDIR} if ( defined $ENV{'PORTSDIR'} );
-$ENV{'PL_CVS_IGNORE'} //= '';
my $mfile_moved = "${portsdir}/MOVED";
my $mfile_uids = "${portsdir}/UIDs";
my $mfile_gids = "${portsdir}/GIDs";
@@ -499,8 +498,12 @@
"returns. Strip all carriage returns (e.g. run dos2unix) ".
"in $file.");
}
- if (/^WWW:\s+(\S*)/) {
- my $wwwurl = $1;
+ if (/^WWW:(\s+)(\S*)/) {
+ my $wwwurl = $2;
+ if ($1 ne ' ') {
+ &perror("WARN", $file, -1, "use WWW: with a single space, ".
+ "then $wwwurl");
+ }
if ($wwwurl !~ m|^https?://|) {
&perror("WARN", $file, -1, "WWW URL, $wwwurl should begin ".
"with \"http://\" or \"https://\".");
@@ -1341,7 +1344,7 @@
}
} elsif ($lines[1] !~ /^# \$$rcsidstr[:\$]/ or $lines[2] !~ /^$/) {
&perror("FATAL", $file, 1, "incorrect header; ".
- "use Created by: with a space, then \$$rcsidstr\$.");
+ "use Created by: with a single space, then \$$rcsidstr\$.");
}
#
@@ -1431,7 +1434,9 @@
OPTIONS_DEFAULT
OPTIONS_DEFINE
OPTIONS_EXCLUDE
+ OPTIONS_GROUP.*?
OPTIONS_MULTI.*?
+ OPTIONS_RADIO.*?
OPTIONS_SINGLE.*?
);
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301150959.r0F9xgub097767>