Skip to content

Commit 440351d

Browse files
authored
[main] Adding --assumeyes for TDNF calls. (#2641) (#2642)
1 parent decb4c8 commit 440351d

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

toolkit/tools/imagegen/installutils/installutils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ func initializeTdnfConfiguration(installRoot string) (err error) {
580580

581581
logger.Log.Debugf("Downloading '%s' package to a clean RPM root under '%s'.", releasePackage, installRoot)
582582

583-
err = shell.ExecuteLive(squashErrors, "tdnf", "download", "--alldeps", "--destdir", installRoot, releasePackage)
583+
err = shell.ExecuteLive(squashErrors, "tdnf", "download", "--assumeyes", "--alldeps", "--destdir", installRoot, releasePackage)
584584
if err != nil {
585585
logger.Log.Errorf("Failed to prepare the RPM database on downloading the 'mariner-release' package: %v", err)
586586
return

toolkit/tools/internal/packagerepo/repocloner/rpmrepocloner/rpmrepocloner.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ func (r *RpmRepoCloner) Clone(cloneDeps bool, packagesToClone ...*pkgjson.Packag
269269

270270
logger.Log.Debugf("Cloning: %s", pkgName)
271271
args := []string{
272+
"--assumeyes",
272273
"--destdir",
273274
chrootDownloadDir,
274275
pkgName,
@@ -301,6 +302,7 @@ func (r *RpmRepoCloner) WhatProvides(pkgVer *pkgjson.PackageVer) (packageNames [
301302
baseArgs := []string{
302303
"provides",
303304
provideQuery,
305+
"--assumeyes",
304306
fmt.Sprintf("--disablerepo=%s", allRepoIDs),
305307
}
306308

@@ -423,6 +425,7 @@ func (r *RpmRepoCloner) ClonedRepoContents() (repoContents *repocloner.RepoConte
423425
tdnfArgs := []string{
424426
"list",
425427
"ALL",
428+
"--assumeyes",
426429
fmt.Sprintf("--disablerepo=%s", allRepoIDs),
427430
fmt.Sprintf("--enablerepo=%s", checkedRepoID),
428431
}

0 commit comments

Comments
 (0)