export non-makepkg flags, resolves #149

This commit is contained in:
2022-12-27 17:56:37 +01:00
parent ba9636cffd
commit f93d14c332
2 changed files with 2 additions and 2 deletions

View File

@@ -145,7 +145,7 @@ func (p *ProtoPackage) build(ctx context.Context) (time.Duration, error) {
// which leads to errors when it's trying to remove the same temporary download file.
// This can be removed as soon as we can pass separate cache locations to makechrootpkg.
rand.Seed(time.Now().UnixNano())
time.Sleep(time.Duration(rand.Float32()*60) * time.Second) //nolint:gosec
time.Sleep(time.Duration(rand.Float32()*60) * time.Second) //nolint:gomnd,gosec
start := time.Now().UTC()
chroot := "build_" + uuid.New().String()

View File

@@ -856,7 +856,7 @@ func parseFlagSection(section interface{}, makepkgConf, march string) (string, e
if len(orgMatch) == 0 {
// no match found, assume env var and append it
log.Debugf("no match found for %s:%v, appending", subSec, subMap)
makepkgConf += fmt.Sprintf("\n%s=%s", strings.ToUpper(subSec.(string)), replaceStringsFromMap(subMap.(string), replaceMap))
makepkgConf += fmt.Sprintf("\nexport %s=%s", strings.ToUpper(subSec.(string)), replaceStringsFromMap(subMap.(string), replaceMap))
continue
}