Merge pull request #112 from NeilHanlon/main
fix(regression): respect modules enabled by ModuleMd during module builds
This commit is contained in:
commit
10aab151d5
|
@ -687,8 +687,15 @@ func (c *Controller) BuildArchActivity(ctx context.Context, projectId string, pa
|
|||
c.log.Infof("no extra options to process for package")
|
||||
}
|
||||
|
||||
extraOptions.DisabledModules = disableModules
|
||||
extraOptions.Modules = enableModules
|
||||
if extraOptions.DisabledModules == nil {
|
||||
extraOptions.DisabledModules = []string{}
|
||||
}
|
||||
extraOptions.DisabledModules = append(extraOptions.DisabledModules, disableModules...)
|
||||
|
||||
if extraOptions.Modules == nil {
|
||||
extraOptions.Modules = []string{}
|
||||
}
|
||||
extraOptions.Modules = append(extraOptions.Modules, enableModules...)
|
||||
|
||||
hostArch := os.Getenv("REAL_BUILD_ARCH")
|
||||
err = c.writeMockConfig(&project, packageVersion, extraOptions, arch, hostArch, pkgGroup)
|
||||
|
|
|
@ -425,8 +425,15 @@ func (c *Controller) BuildSRPMActivity(ctx context.Context, upstreamPrefix strin
|
|||
c.log.Infof("no extra options to process for package")
|
||||
}
|
||||
|
||||
extraOptions.DisabledModules = disableModules
|
||||
extraOptions.Modules = enableModules
|
||||
if extraOptions.DisabledModules == nil {
|
||||
extraOptions.DisabledModules = []string{}
|
||||
}
|
||||
extraOptions.DisabledModules = append(extraOptions.DisabledModules, disableModules...)
|
||||
|
||||
if extraOptions.Modules == nil {
|
||||
extraOptions.Modules = []string{}
|
||||
}
|
||||
extraOptions.Modules = append(extraOptions.Modules, enableModules...)
|
||||
|
||||
hostArch := os.Getenv("REAL_BUILD_ARCH")
|
||||
extraOptions.EnableNetworking = true
|
||||
|
|
Loading…
Reference in New Issue