diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2013-01-15 14:54:47 +0200 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2013-01-16 20:47:29 +0100 |
| commit | af0ee434a65d807df7b32c01f891ac0382fe4e70 (patch) | |
| tree | 1d15d84314aed69f22653a6c1695406adb3af61e | |
| parent | 9ec98c54e162db94fb77ba619f1974f4e4c93d07 (diff) | |
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 <markus.lehtonen@linux.intel.com>
| -rw-r--r-- | gbp/scripts/common/pq.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gbp/scripts/common/pq.py b/gbp/scripts/common/pq.py index 57edd19d..ce063536 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 " |