From 1dc1f9d0625a96162ed120e112648a9fe4c62521 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 11 Mar 2019 01:20:40 +0000 Subject: [PATCH] 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. --- debian/bin/gencontrol_signed.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/debian/bin/gencontrol_signed.py b/debian/bin/gencontrol_signed.py index 9c47c3cf8..8d9436fde 100755 --- a/debian/bin/gencontrol_signed.py +++ b/debian/bin/gencontrol_signed.py @@ -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: