diff options
Diffstat (limited to 'gbp/scripts')
| -rw-r--r-- | gbp/scripts/common/pq.py | 8 | ||||
| -rwxr-xr-x | gbp/scripts/pq.py | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/gbp/scripts/common/pq.py b/gbp/scripts/common/pq.py index cff5bf36..3f939678 100644 --- a/gbp/scripts/common/pq.py +++ b/gbp/scripts/common/pq.py @@ -145,12 +145,12 @@ def switch_to_pq_branch(repo, branch): repo.set_branch(pq_branch) -def apply_single_patch(repo, branch, patch, topic=None): +def apply_single_patch(repo, branch, patch, get_author_info, topic=None): switch_to_pq_branch(repo, branch) - apply_and_commit_patch(repo, patch, topic) + apply_and_commit_patch(repo, patch, get_author_info, topic) -def apply_and_commit_patch(repo, patch, topic=None): +def apply_and_commit_patch(repo, patch, get_author_info, topic=None): """apply a single patch 'patch', add topic 'topic' and commit it""" author = {'name': patch.author, 'email': patch.email, @@ -158,7 +158,7 @@ def apply_and_commit_patch(repo, patch, topic=None): patch_fn = os.path.basename(patch.path) if not (patch.author and patch.email): - name, email = get_maintainer_from_control(repo) + name, email = get_author_info(repo) if name: gbp.log.warn("Patch '%s' has no authorship information, " "using '%s <%s>'" % (patch_fn, name, email)) diff --git a/gbp/scripts/pq.py b/gbp/scripts/pq.py index fbd59a79..bc572388 100755 --- a/gbp/scripts/pq.py +++ b/gbp/scripts/pq.py @@ -31,7 +31,7 @@ from gbp.patch_series import (PatchSeries, Patch) from gbp.scripts.common.pq import (is_pq_branch, pq_branch_name, pq_branch_base, write_patch, switch_to_pq_branch, apply_single_patch, apply_and_commit_patch, - drop_pq) + drop_pq, get_maintainer_from_control) PATCH_DIR = "debian/patches/" SERIES_FILE = os.path.join(PATCH_DIR,"series") @@ -146,7 +146,9 @@ def import_quilt_patches(repo, branch, series, tries, force): for patch in queue: gbp.log.debug("Applying %s" % patch.path) try: - apply_and_commit_patch(repo, patch, patch.topic) + apply_and_commit_patch(repo, patch, + get_maintainer_from_control, + patch.topic) except (GbpError, GitRepositoryError): repo.set_branch(branch) repo.delete_branch(pq_branch) @@ -250,7 +252,9 @@ def main(argv): rebase_pq(repo, current) elif action == "apply": patch = Patch(patchfile) - apply_single_patch(repo, current, patch, options.topic) + apply_single_patch(repo, current, patch, + get_maintainer_from_control, + options.topic) elif action == "switch": switch_pq(repo, current) except CommandExecFailed: |