Attachment 150308 Details for Bug 195780 – Exclude .git directory from error.

[patch] Exclude .git directory from error.

patch-ports-mgmt_portlint (text/plain), 1.86 KB, created by Yasuhiro Kimura on 2014-12-07 16:18:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2014-12-07 16:18:42 UTC

Size: 1.86 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 374206)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	portlint
>-PORTVERSION=	2.16.1
>-PORTREVISION=	1
>+PORTVERSION=	2.16.2
> CATEGORIES=	ports-mgmt
> MASTER_SITES=	# none
> DISTFILES=	# none
>Index: src/portlint.pl
>===================================================================
>--- src/portlint.pl	(revision 374206)
>+++ src/portlint.pl	(working copy)
>@@ -50,7 +50,7 @@
> # version variables
> my $major = 2;
> my $minor = 16;
>-my $micro = 1;
>+my $micro = 2;
> 
> # default setting - for FreeBSD
> my $portsdir = '/usr/ports';
>@@ -289,12 +289,12 @@
> 				    "If it still needs to be there, put a dummy comment ".
> 					"to state that the file is intentionally left empty.");
> 		} elsif (-d && scalar(my @x = <$_/{*,.?*}>) <= 1) {
>-			&perror("FATAL", $fullname, -1, "empty directory should be removed.") unless ($fullname =~ /^\.svn/);
>+			&perror("FATAL", $fullname, -1, "empty directory should be removed.") unless ($fullname =~ /^\.svn/ || $fullname =~ /^\.git/);
> 		} elsif (/^\./) {
> 			&perror("WARN", $fullname, -1, "dotfiles are not preferred. ".
> 					"If this file is a dotfile to be installed as an example, ".
> 					"consider importing it as \"dot$_\".") unless
>-					(-d && $_ eq '.svn');
>+					(-d && ($_ eq '.svn' || $_ eq '.git'));
> 		} elsif (/[^-.a-zA-Z0-9_\+]/) {
> 			&perror("WARN", $fullname, -1, "only use characters ".
> 					"[-_.a-zA-Z0-9+] for patch or script names.");
>@@ -307,7 +307,7 @@
> 		} elsif (/README.html/) {
> 			&perror("FATAL", $fullname, -1, "for safety, be sure to cleanup ".
> 					"README.html files before committing the port.");
>-		} elsif ($_ eq '.svn' && -d) {
>+		} elsif (($_ eq '.svn' || $_ eq '.git') && -d) {
> 			&perror("FATAL", $fullname, -1, "for safety, be sure to cleanup ".
> 				"Subversion files before committing the port.");
>

Actions: View | Diff

Attachments on bug 195780: 150308