[gentoo-portage-dev] [PATCH] Switch to new git '# $Id$' header format

[gentoo-portage-dev] [PATCH] Switch to new git '# $Id$' header format

[Sergei Trofimovich]

From: Sergei Trofimovich <siarheit@google.com>

Currently repoman complains on every ebuild in ::gentoo.

Signed-off-by: Sergei Trofimovich <siarheit@google.com>
---
 pym/repoman/checks.py | 7 +++----
 pym/repoman/errors.py | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index 5f37648..4ab23d1 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -81,7 +81,7 @@ class EbuildHeader(LineCheck):
 	# 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 = '# Distributed under the terms of the GNU General Public License v2'
-	cvs_header = re.compile(r'^# \$Header: .*\$$')
+	id_header = '# $Id$'
 	ignore_comment = False
 
 	def new(self, pkg):
@@ -100,9 +100,8 @@ class EbuildHeader(LineCheck):
 				return errors.COPYRIGHT_ERROR
 		elif num == 1 and line.rstrip('\n') != self.gentoo_license:
 			return errors.LICENSE_ERROR
-		elif num == 2:
-			if not self.cvs_header.match(line):
-				return errors.CVS_HEADER_ERROR
+		elif num == 2 and line.rstrip('\n') != self.id_header:
+			return errors.ID_HEADER_ERROR
 
 
 class EbuildWhitespace(LineCheck):
diff --git a/pym/repoman/errors.py b/pym/repoman/errors.py
index 3833be6..74a5959 100644
--- a/pym/repoman/errors.py
+++ b/pym/repoman/errors.py
@@ -6,7 +6,7 @@ from __future__ import unicode_literals
 
 COPYRIGHT_ERROR = 'Invalid Gentoo Copyright on line: %d'
 LICENSE_ERROR = 'Invalid Gentoo/GPL License on line: %d'
-CVS_HEADER_ERROR = 'Malformed CVS Header on line: %d'
+ID_HEADER_ERROR = 'Malformed Id header on line: %d'
 LEADING_SPACES_ERROR = 'Ebuild contains leading spaces on line: %d'
 TRAILING_WHITESPACE_ERROR = 'Trailing whitespace error on line: %d'
 READONLY_ASSIGNMENT_ERROR = 'Ebuild contains assignment to read-only variable on line: %d'
-- 
2.5.0

Re: [gentoo-portage-dev] [PATCH] Switch to new git '# $Id$' header format

[Alexander Berntsen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Looks OK to me. Brian -- merge if it's an OK time to include this
patch, with the whole refactor thing going on.

- -- 
Alexander
bernalex@gentoo.org
https://secure.plaimi.net/~alexander
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iQIcBAEBCgAGBQJVyFIOAAoJENQqWdRUGk8BSXYQAKpfLGVJdgQwutq2pvVCFSRL
CbRTAIGFshZu21VPT8wFWV5SEDjACiyj/lXEyCD+mwtHFYrMNsOayNa6bhJEfTm9
YUHBvNVcXbSdre5svgTinwvFr84l+w8JE5S7pofj29+t2wrZlDjL0BcOlZAKJQEI
SEbxPqSpfcleyYwSt7wbsoNK5vXVqRxpL+zz2ZuBFvs9j27QM6roCfVakAQxzrjW
XzbS3XdhbOoaeamb3R7CBREvv/5oX++Cd8BhabqjotR+p9lw37N2RnMudh70s+WP
vCUIAwPbhliNokhasJQyVk/1wTSutPfrn2bKRl6x3kICvr4b0+epx0SXtS0YsflQ
vsk3JD7nE1RweXgH4HFcP8UJesmxI1BYgLAOKa126UzZcy2GsoIgjs53YOm4M1BC
4Gr6L+MIMz3O8YA2c6G7icJ+TzRSrxFqEVLRVhlsLHwg7JEOoLNoMMABrQYWBeLq
6lm/Y5uGIAf0cioh/m1WLXyTW3xW8kgiGQ7pT28EQ1aSAyj54Lu62VDctOEA3fz7
caWHrT0/iBbu66E3uDMZ2wFU1M+SyJBlKftcIVGo2VlyElP1fMYd4ShW0zKO2FEz
tirTrMHxg0MU46lRdPiD3I+Jpmz7jTw1XBF9L0G+fErTr4DIoViNdnuoFQIvVk4b
nh/hvxAVCy26GHVIwgMe
=1Nv8
-----END PGP SIGNATURE-----

Re: [gentoo-portage-dev] [PATCH] Switch to new git '# $Id$' header format

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]

Dnia 2015-08-09, o godz. 19:11:57
Sergei Trofimovich <slyfox@gentoo.org> napisał(a):

> From: Sergei Trofimovich <siarheit@google.com>
> 
> Currently repoman complains on every ebuild in ::gentoo.
> 
> Signed-off-by: Sergei Trofimovich <siarheit@google.com>

Pushed now.

-- 
Best regards,
Michał Górny
<http://dev.gentoo.org/~mgorny/>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 949 bytes --]