launchpad-buildd

Merge ~cjwatson/launchpad-buildd:sourcepackagerecipe-remove-distroseries-name into launchpad-buildd:master

  1. Git
  2. lp:~cjwatson/launchpad-buildd
  3. sourcepackagerecipe-remove-distroseries-name
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 3a08ccbd21de57cdcf5659f8749f939fb11992c3
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad-buildd:sourcepackagerecipe-remove-distroseries-name
Merge into: launchpad-buildd:master
Diff against target: 46 lines (+3/-3)
3 files modified
debian/changelog (+2/-0)
lpbuildd/sourcepackagerecipe.py (+1/-2)
lpbuildd/tests/test_sourcepackagerecipe.py (+0/-1)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+435135@code.launchpad.net

Commit message

sourcepackagerecipe: Remove the old "distroseries_name" argument

Description of the change

This duplicated the common "series" argument.

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 0ad4ac1..6af237d 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -3,6 +3,8 @@ launchpad-buildd (226) UNRELEASED; urgency=medium
6 * Remove unused "distribution" argument from the binarypackage manager.
7 This was only used with the old internal sbuild fork, which we dropped
8 in launchpad-buildd 127.
9+ * Remove the old "distroseries_name" argument from the sourcepackagerecipe
10+ manager, which duplicated the common "series" argument.
11
12 -- Colin Watson <cjwatson@ubuntu.com> Wed, 04 Jan 2023 12:58:36 +0000
13
14diff --git a/lpbuildd/sourcepackagerecipe.py b/lpbuildd/sourcepackagerecipe.py
15index 15d5d65..9b5520f 100644
16--- a/lpbuildd/sourcepackagerecipe.py
17+++ b/lpbuildd/sourcepackagerecipe.py
18@@ -77,7 +77,6 @@ class SourcePackageRecipeBuildManager(DebianBuildManager):
19 self.author_name = extra_args['author_name']
20 self.author_email = extra_args['author_email']
21 self.archive_purpose = extra_args['archive_purpose']
22- self.distroseries_name = extra_args['distroseries_name']
23 self.git = extra_args.get('git', False)
24
25 super().initiate(files, chroot, extra_args)
26@@ -92,7 +91,7 @@ class SourcePackageRecipeBuildManager(DebianBuildManager):
27 args.append("--git")
28 args.extend([
29 self._buildid, self.author_name.encode('utf-8'),
30- self.author_email, self.suite, self.distroseries_name,
31+ self.author_email, self.suite, self.series,
32 self.component, self.archive_purpose])
33 self.runSubProcess(self.build_recipe_path, args)
34
35diff --git a/lpbuildd/tests/test_sourcepackagerecipe.py b/lpbuildd/tests/test_sourcepackagerecipe.py
36index 2cf7fd3..52493f8 100644
37--- a/lpbuildd/tests/test_sourcepackagerecipe.py
38+++ b/lpbuildd/tests/test_sourcepackagerecipe.py
39@@ -72,7 +72,6 @@ class TestSourcePackageRecipeBuildManagerIteration(TestCase):
40 'author_name': 'Steve\u1234',
41 'author_email': 'stevea@example.org',
42 'archive_purpose': 'puppies',
43- 'distroseries_name': 'maverick',
44 'archives': [
45 'deb http://archive.ubuntu.com/ubuntu maverick main universe',
46 'deb http://ppa.launchpad.net/launchpad/bzr-builder-dev/'

Subscribers

People subscribed via source and target branches