From af0ee434a65d807df7b32c01f891ac0382fe4e70 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Tue, 15 Jan 2013 14:54:47 +0200 Subject: pq/apply_and_commit_patch: fix date parsing GitModifier doesn't support dates in the format used in git format-patch emails. Signed-off-by: Markus Lehtonen --- gbp/scripts/common/pq.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gbp/scripts') diff --git a/gbp/scripts/common/pq.py b/gbp/scripts/common/pq.py index 57edd19..ce06353 100644 --- a/gbp/scripts/common/pq.py +++ b/gbp/scripts/common/pq.py @@ -251,10 +251,12 @@ def apply_single_patch(repo, branch, patch, fallback_author, topic=None): def apply_and_commit_patch(repo, patch, fallback_author, topic=None): """apply a single patch 'patch', add topic 'topic' and commit it""" - author = GitModifier(patch.author, patch.email, patch.date) + author = {'name': patch.author, + 'email': patch.email, + 'date': patch.date } patch_fn = os.path.basename(patch.path) - if not (author.name and author.email): + if not (author['name'] and author['email']): if fallback_author and fallback_author['name']: author = fallback_author gbp.log.warn("Patch '%s' has no authorship information, using " -- cgit v1.2.3