diff options
| author | Guido Günther <agx@sigxcpu.org> | 2015-01-29 10:04:27 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2015-02-08 16:15:03 +0100 |
| commit | 64be54db7546e7399b5b758d3f25c507180180e1 (patch) | |
| tree | cbde8aeb7e15be1c29daf877097035e5925b3f50 | |
| parent | a6cf21deca04b965ed5d0f706e9e027146bf6512 (diff) | |
pq: Generate new style Gbp-Pq: Topic <topic> entries
We shouldn't generate the deprecated ones
| -rw-r--r-- | gbp/scripts/common/pq.py | 2 | ||||
| -rw-r--r-- | tests/13_test_gbp_pq.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gbp/scripts/common/pq.py b/gbp/scripts/common/pq.py index 04bb7122..a82e462f 100644 --- a/gbp/scripts/common/pq.py +++ b/gbp/scripts/common/pq.py @@ -275,7 +275,7 @@ def apply_and_commit_patch(repo, patch, fallback_author, topic=None): tree = repo.write_tree() msg = "%s\n\n%s" % (patch.subject, patch.long_desc) if topic: - msg += "\nGbp-Pq-Topic: %s" % topic + msg += "\nGbp-Pq: Topic %s" % topic commit = repo.commit_tree(tree, msg, [repo.head], author=author) repo.update_ref('HEAD', commit, msg="gbp-pq import %s" % patch.path) diff --git a/tests/13_test_gbp_pq.py b/tests/13_test_gbp_pq.py index d88f7aed..c17b7151 100644 --- a/tests/13_test_gbp_pq.py +++ b/tests/13_test_gbp_pq.py @@ -47,7 +47,7 @@ class TestApplyAndCommit(testutils.DebianGitTestRepo): pq.apply_and_commit_patch(self.repo, patch, None, topic='foobar') info = self.repo.get_commit_info('HEAD') - self.assertIn('Gbp-Pq-Topic: foobar', info['body']) + self.assertIn('Gbp-Pq: Topic foobar', info['body']) @unittest.skipIf(not os.path.exists('/usr/bin/dpkg'), 'Dpkg not found') def test_debian_missing_author(self): @@ -111,7 +111,7 @@ class TestWritePatch(testutils.DebianGitTestRepo): # Add test file with topic: msg = ("added foo\n\n" - "Gbp-Pq-Topic: gbptest") + "Gbp-Pq: Topic gbptest") self.add_file('foo', 'foo', msg) # Write it out as patch and check it's existence |