Colin Watson has proposed merging
~cjwatson/launchpad-buildd:sourcepackagerecipe-remove-distroseries-name into
launchpad-buildd:master.
Commit message:
sourcepackagerecipe: Remove the old "distroseries_name" argument
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-buildd/+git/launchpad-buildd/+merge/435135
This duplicated the common "series" argument.
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~cjwatson/launchpad-buildd:sourcepackagerecipe-remove-distroseries-name into
launchpad-buildd:master.
diff --git a/debian/changelog b/debian/changelog
index b306ecb..7e6ed12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+launchpad-buildd (226) UNRELEASED; urgency=medium
+
+ * Remove the old "distroseries_name" argument from the sourcepackagerecipe
+ manager, which duplicated the common "series" argument.
+
+ -- Colin Watson <cjwat...@ubuntu.com> Wed, 04 Jan 2023 13:33:59 +0000
+
launchpad-buildd (225) focal; urgency=medium
* Fix add-trusted-keys regression due to Backend.open calling "lxc exec"
diff --git a/lpbuildd/sourcepackagerecipe.py b/lpbuildd/sourcepackagerecipe.py
index 15d5d65..9b5520f 100644
--- a/lpbuildd/sourcepackagerecipe.py
+++ b/lpbuildd/sourcepackagerecipe.py
@@ -77,7 +77,6 @@ class SourcePackageRecipeBuildManager(DebianBuildManager):
self.author_name = extra_args['author_name']
self.author_email = extra_args['author_email']
self.archive_purpose = extra_args['archive_purpose']
- self.distroseries_name = extra_args['distroseries_name']
self.git = extra_args.get('git', False)
super().initiate(files, chroot, extra_args)
@@ -92,7 +91,7 @@ class SourcePackageRecipeBuildManager(DebianBuildManager):
args.append("--git")
args.extend([
self._buildid, self.author_name.encode('utf-8'),
- self.author_email, self.suite, self.distroseries_name,
+ self.author_email, self.suite, self.series,
self.component, self.archive_purpose])
self.runSubProcess(self.build_recipe_path, args)
diff --git a/lpbuildd/tests/test_sourcepackagerecipe.py b/lpbuildd/tests/test_sourcepackagerecipe.py
index 2cf7fd3..52493f8 100644
--- a/lpbuildd/tests/test_sourcepackagerecipe.py
+++ b/lpbuildd/tests/test_sourcepackagerecipe.py
@@ -72,7 +72,6 @@ class TestSourcePackageRecipeBuildManagerIteration(TestCase):
'author_name': 'Steve\u1234',
'author_email': 'ste...@example.org',
'archive_purpose': 'puppies',
- 'distroseries_name': 'maverick',
'archives': [
'deb http://archive.ubuntu.com/ubuntu maverick main universe',
'deb http://ppa.launchpad.net/launchpad/bzr-builder-dev/'
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
