| 1 |
commit: 5b8354a9ae9db7700663e4ea4c987628fbfc5255 |
| 2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
| 3 |
AuthorDate: Fri Apr 6 22:24:48 2012 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 6 22:25:27 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/overlint.git;a=commit;h=5b8354a9 |
| 7 |
|
| 8 |
No longer count CVS metadata or copyright years as changes |
| 9 |
|
| 10 |
--- |
| 11 |
overlint/cli.py | 7 +++++-- |
| 12 |
1 files changed, 5 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/overlint/cli.py b/overlint/cli.py |
| 15 |
index 10a3ef7..a0720b2 100644 |
| 16 |
--- a/overlint/cli.py |
| 17 |
+++ b/overlint/cli.py |
| 18 |
@@ -3,7 +3,7 @@ |
| 19 |
|
| 20 |
from __future__ import print_function |
| 21 |
|
| 22 |
-VERSION_STR = '0.2' |
| 23 |
+VERSION_STR = '0.3' |
| 24 |
|
| 25 |
import sys |
| 26 |
import os |
| 27 |
@@ -80,7 +80,10 @@ def find_ebuild_changes(category_package, overlay_path, gentoo_versions, overlay |
| 28 |
category, package = category_package.split('/') |
| 29 |
for version in intersection: |
| 30 |
ebuild_name = '%s-%s.ebuild' % (package, version) |
| 31 |
- command = "bash -c 'cmp --quiet <(fgrep -v KEYWORDS= /usr/portage/%s/%s) <(fgrep -v KEYWORDS= %s/%s/%s) ; exit $?'" % (category_package, ebuild_name, overlay_path, category_package, ebuild_name) |
| 32 |
+ command = """bash -c 'FILTER() { sed -e "/# $Header/d" -e "/# Copyright/d" -e "/KEYWORDS=/d" "$@"; }; """ \ |
| 33 |
+ """cmp --quiet <(FILTER /usr/portage/%s/%s) <(FILTER %s/%s/%s) ; """ \ |
| 34 |
+ """exit $?'""" \ |
| 35 |
+ % (category_package, ebuild_name, overlay_path, category_package, ebuild_name) |
| 36 |
ret = os.system(command) |
| 37 |
if not ret: |
| 38 |
continue |
Archives