debian/bin/gencontrol_signed.py: Use merge_packages instead of open-coding it

We already used it for udebs but not for the regular signed image
package.
This commit is contained in:
Ben Hutchings 2019-03-11 01:20:40 +00:00
parent dcd90f6ce7
commit 1dc1f9d062
1 changed files with 1 additions and 9 deletions

View File

@ -189,15 +189,7 @@ class Gencontrol(Base):
packages_signed = self.process_packages(
self.templates['control.image'], vars)
for package in packages_signed:
name = package['Package']
if name in packages:
package = packages.get(name)
package['Architecture'].add(arch)
else:
package['Architecture'] = arch
packages.append(package)
merge_packages(packages, packages_signed, arch)
cmds_binary_arch = []
for i in packages_signed: