From: Michał Górny <gentoo@mgorny.alt.pl>
Date: Wed, 14 Jul 2010 08:16:14 +0000 (+0200)
Subject: Make copyright/CVS header checks more strict.
X-Git-Tag: v2.2_rc68~505
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=393c3752b59fdd3fd57410323ceb4a377264fa64;p=portage.git

Make copyright/CVS header checks more strict.
---

diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index 025fdf9bf..96c7969ad 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -70,8 +70,8 @@ class EbuildHeader(LineCheck):
 	gentoo_copyright = r'^# Copyright ((1999|2\d\d\d)-)?%s Gentoo Foundation$'
 	# Why a regex here, use a string match
 	# gentoo_license = re.compile(r'^# Distributed under the terms of the GNU General Public License v2$')
-	gentoo_license = r'# Distributed under the terms of the GNU General Public License v2'
-	cvs_header = re.compile(r'^#\s*\$Header.*\$$')
+	gentoo_license = '# Distributed under the terms of the GNU General Public License v2'
+	cvs_header = re.compile(r'^# \$Header: .*\$$')
 
 	def new(self, pkg):
 		if pkg.mtime is None:
@@ -87,7 +87,7 @@ class EbuildHeader(LineCheck):
 		elif num == 0:
 			if not self.gentoo_copyright_re.match(line):
 				return errors.COPYRIGHT_ERROR
-		elif num == 1 and line.strip() != self.gentoo_license:
+		elif num == 1 and line.rstrip('\n') != self.gentoo_license:
 			return errors.LICENSE_ERROR
 		elif num == 2:
 			if not self.cvs_header.match(line):