Skip to content

Commit 2a3402c

Browse files
committed
Restore code reverted by bad rebase
b70e037 was originally based on a very old branch. A rebase was required and was not properly reviewed. Many important changes were accidentially reverted as part of the commit. This change brings those changes back. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
1 parent 9b5448f commit 2a3402c

2 files changed

Lines changed: 1881 additions & 430 deletions

File tree

targets/linux/rpm/distro/pkg.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,18 @@ func (cfg *Config) InstallTestDeps(sOpt dalec.SourceOpts, targetKey string, spec
107107
return dalec.NoopStateOption
108108
}
109109

110+
opts = append(opts, dalec.ProgressGroup("Install test dependencies"))
111+
110112
return func(in llb.State) llb.State {
111113
repos := spec.GetTestRepos(targetKey)
112114
repoMounts, keyPaths := cfg.RepoMounts(repos, sOpt, opts...)
113-
importRepos := []DnfInstallOpt{DnfAtRoot("/tmp/rootfs"), DnfWithMounts(repoMounts), DnfImportKeys(keyPaths)}
115+
importRepos := []DnfInstallOpt{
116+
DnfAtRoot("/tmp/rootfs"),
117+
DnfWithMounts(repoMounts),
118+
DnfImportKeys(keyPaths),
119+
DnfInstallWithConstraints(opts),
120+
}
114121

115-
opts = append(opts, dalec.ProgressGroup("Install test dependencies"))
116122
worker := cfg.Worker(sOpt, dalec.Platform(sOpt.TargetPlatform), dalec.WithConstraints(opts...))
117123
return worker.Run(
118124
dalec.WithConstraints(opts...),

0 commit comments

Comments
 (0)