From 29899538aa65718be75e0ea1f38e4f2184d19b8b Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jan 22 2016 15:12:40 +0000 Subject: Rename variable parentname to parentpath as per @puiterwijk's suggestion --- diff --git a/pagure/internal/__init__.py b/pagure/internal/__init__.py index b541fc4..ac2aca5 100644 --- a/pagure/internal/__init__.py +++ b/pagure/internal/__init__.py @@ -271,15 +271,16 @@ def get_pull_request_ready_branch(): diff_commits = [] if repo.is_fork: - parentname = os.path.join( + parentpath = os.path.join( pagure.APP.config['GIT_FOLDER'], repo.parent.path) if repo.parent.is_fork: - parentname = os.path.join( + parentpath = os.path.join( pagure.APP.config['FORK_FOLDER'], repo.parent.path) else: - parentname = os.path.join(pagure.APP.config['GIT_FOLDER'], repo.path) + parentpath = os.path.join( + pagure.APP.config['GIT_FOLDER'], repo.path) - orig_repo = pygit2.Repository(parentname) + orig_repo = pygit2.Repository(parentpath) if not repo_obj.is_empty and not orig_repo.is_empty \ and repo_obj.listall_branches() > 1: