[gentoo-commits] repo/gentoo:master commit in: dev-vcs/gitstats/, dev-vcs/gitstats/files/

[Guilherme Amadio]

commit:     93db43bd48d1ad8a64996e52b73838d6318207e6
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  1 12:54:54 2016 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Fri Apr  1 13:09:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93db43bd

dev-vcs/gitstats: force text processing by grep

Fix for bug 575946 by forcing grep to process commit data as text even when
invalid unicode characters appear.

Reported-by: Martin Mokrejš

Package-Manager: portage-2.2.28

 .../files/gitstats-0_pre20151223-grep-force-text.patch        | 11 +++++++++++
 dev-vcs/gitstats/gitstats-0_pre20151223.ebuild                |  1 +
 2 files changed, 12 insertions(+)

diff --git a/dev-vcs/gitstats/files/gitstats-0_pre20151223-grep-force-text.patch b/dev-vcs/gitstats/files/gitstats-0_pre20151223-grep-force-text.patch
new file mode 100644
index 0000000..9663afc
--- /dev/null
+++ b/dev-vcs/gitstats/files/gitstats-0_pre20151223-grep-force-text.patch
@@ -0,0 +1,11 @@
+--- a/gitstats	2016-04-01 09:46:31.000000000 -0300
++++ b/gitstats	2016-04-01 09:46:18.458667610 -0300
+@@ -327,7 +327,7 @@
+ 
+ 		# Collect revision statistics
+ 		# Outputs "<stamp> <date> <time> <timezone> <author> '<' <mail> '>'"
+-		lines = getpipeoutput(['git rev-list --pretty=format:"%%at %%ai %%aN <%%aE>" %s' % getlogrange('HEAD'), 'grep -v ^commit']).split('\n')
++		lines = getpipeoutput(['git rev-list --pretty=format:"%%at %%ai %%aN <%%aE>" %s' % getlogrange('HEAD'), 'grep -av ^commit']).split('\n')
+ 		for line in lines:
+ 			parts = line.split(' ', 4)
+ 			author = ''

diff --git a/dev-vcs/gitstats/gitstats-0_pre20151223.ebuild b/dev-vcs/gitstats/gitstats-0_pre20151223.ebuild
index a4a6a19..451a152 100644
--- a/dev-vcs/gitstats/gitstats-0_pre20151223.ebuild
+++ b/dev-vcs/gitstats/gitstats-0_pre20151223.ebuild
@@ -39,6 +39,7 @@ src_prepare() {
 	sed \
 		-e "s:basedirs = \[binarypath, secondarypath, '/usr/share/gitstats'\]:basedirs = \['${EPREFIX}/usr/share/gitstats'\]:g" \
 	-i gitstats || die "failed to fix static files path"
+	eapply "${FILESDIR}"/${P}-grep-force-text.patch
 	default
 }