Index: head/devel/py-gitless/Makefile =================================================================== --- head/devel/py-gitless/Makefile (revision 502908) +++ head/devel/py-gitless/Makefile (revision 502909) @@ -1,36 +1,36 @@ # Created by: Carlos J. Puga Medina # $FreeBSD$ PORTNAME= gitless PORTVERSION= 0.8.6 -PORTREVISION= 1 DISTVERSIONPREFIX= v +PORTREVISION= 2 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= cpm@FreeBSD.org COMMENT= Version control system built on top of Git LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}clint>=0.5.1:devel/py-clint@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygit2>=0.26.0:devel/py-pygit2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sh>=1.12.14:devel/py-sh@${PY_FLAVOR} \ git:devel/git TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent distutils USE_LOCALE= en_US.UTF-8 USE_GITHUB= yes GH_ACCOUNT= sdg-mit NO_ARCH= yes do-test: @cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} nosetests-${PYTHON_VER} -v .include Index: head/devel/py-gitless/files/patch-gitless_core.py =================================================================== --- head/devel/py-gitless/files/patch-gitless_core.py (nonexistent) +++ head/devel/py-gitless/files/patch-gitless_core.py (revision 502909) @@ -0,0 +1,55 @@ +--- gitless/core.py.orig 2019-05-28 19:39:17 UTC ++++ gitless/core.py +@@ -58,6 +58,13 @@ GL_STATUS_TRACKED = 2 + GL_STATUS_IGNORED = 3 + + ++def error_on_none(path): ++ """Raise a KeyError if the ```path``` argument is None.""" ++ if path is None: ++ raise KeyError('path') ++ return path ++ ++ + def init_repository(url=None): + """Creates a new Gitless's repository in the cwd. + +@@ -67,7 +74,7 @@ def init_repository(url=None): + """ + cwd = os.getcwd() + try: +- pygit2.discover_repository(cwd) ++ error_on_none(pygit2.discover_repository(cwd)) + raise GlError('You are already in a Gitless repository') + except KeyError: # Expected + if not url: +@@ -108,7 +115,7 @@ class Repository(object): + def __init__(self): + """Create a Repository out of the current working repository.""" + try: +- path = pygit2.discover_repository(os.getcwd()) ++ path = error_on_none(pygit2.discover_repository(os.getcwd())) + except KeyError: + raise NotInRepoError('You are not in a Gitless\'s repository') + +@@ -1333,10 +1340,18 @@ OpCb = collections.namedtuple( + 'OpCb', ['apply_ok', 'apply_err', 'save', 'restore_ok']) + + def stdout(p): +- return p.stdout.decode(ENCODING) ++ try: ++ pstdout = p.stdout.decode(ENCODING) ++ except AttributeError: ++ pstdout = p.stdout ++ return pstdout + + def stderr(p): +- return p.stderr.decode(ENCODING) ++ try: ++ pstderr = p.stderr.decode(ENCODING) ++ except AttributeError: ++ pstderr = p.stderr ++ return pstderr + + def walker(git_repo, target, reverse): + flags = pygit2.GIT_SORT_TOPOLOGICAL | pygit2.GIT_SORT_TIME Property changes on: head/devel/py-gitless/files/patch-gitless_core.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property