[lxc-devel] [distrobuilder/master] shared/definition: Fix early packages

[monstermunchkin on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 465 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20200304/208e6b28/attachment.bin>
-------------- next part --------------
From 601d5579f97a3704482cc708b3670f067e1091e5 Mon Sep 17 00:00:00 2001
From: Thomas Hipp <thomas.hipp at canonical.com>
Date: Wed, 4 Mar 2020 11:31:20 +0100
Subject: [PATCH] shared/definition: Fix early packages

Early packages usually don't have a specific target and therefore should
have no value for that.

Signed-off-by: Thomas Hipp <thomas.hipp at canonical.com>
---
 shared/definition.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/definition.go b/shared/definition.go
index b8fa7eb..e37b9ee 100644
--- a/shared/definition.go
+++ b/shared/definition.go
@@ -501,7 +501,7 @@ func (d *Definition) GetEarlyPackages(action string) []string {
 	normal := []DefinitionPackagesSet{}
 
 	for _, set := range d.Packages.Sets {
-		if set.Early && set.Action == action && ApplyFilter(&set, d.Image.Release, d.Image.ArchitectureMapped, d.Image.Variant, d.Targets.Type, ImageTargetAll) {
+		if set.Early && set.Action == action && ApplyFilter(&set, d.Image.Release, d.Image.ArchitectureMapped, d.Image.Variant, d.Targets.Type, 0) {
 			early = append(early, set.Packages...)
 		} else {
 			normal = append(normal, set)