gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

www-apps/blohg: update libgit2 dependency

Browse Source 
Package-Manager: portage-2.2.28
This commit is contained in:
Rafael Martins
2016-11-07 00:06:24 +01:00
parent a766a6c843
commit 930998b2fd
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www-apps/blohg/blohg-0.13-r1.ebuild → www-apps/blohg/blohg-0.13-r2.ebuild
View File

@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
EAPI=6
PYTHON_COMPAT=( python2_7 )
@@ -42,7 +42,7 @@ RDEPEND="
dev-python/pyyaml
dev-python/setuptools
dev-python/pygments
git? ( =dev-python/pygit2-0.20* )
git? ( >=dev-python/pygit2-0.21.3 )
mercurial? ( >=dev-vcs/mercurial-1.6 )"
DEPEND="${RDEPEND}
@@ -52,6 +52,8 @@ DEPEND="${RDEPEND}
python_prepare_all() {
if ! use git; then
rm -rf blohg/vcs_backends/git || die 'rm failed'
else
local PATCHES=( "${FILESDIR}/use-recent-libgit2.patch" )
fi
if ! use mercurial; then

17
www-apps/blohg/files/use-recent-libgit2.patch Normal file
View File

@@ -0,0 +1,17 @@
diff --git a/blohg/vcs_backends/git/filectx.py b/blohg/vcs_backends/git/filectx.py
index 84f7aa3..5e20762 100644
--- a/blohg/vcs_backends/git/filectx.py
+++ b/blohg/vcs_backends/git/filectx.py
@@ -73,7 +73,11 @@ def _last_changeset(self):
GIT_SORT_TIME):
diff = self._repo.diff(head, commit)
for patch in diff:
- if patch.new_file_path == self._path:
+ try:
+ new_file_path = patch.delta.new_file.path
+ except AttributeError:
+ new_file_path = patch.new_file_path
+ if new_file_path == self._path:
return head
head = commit