Skip to content

Commit 36c6042

Browse files
committed
deps: images 0.191.0
Bump the images dependency to 0.191.0 and handle the rename of `dnfjson` to `depsolvednf`. Signed-off-by: Simon de Vlieger <[email protected]>
1 parent 3efa47f commit 36c6042

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

bib/cmd/bootc-image-builder/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/osbuild/images/pkg/cloud/awscloud"
2828
"github.com/osbuild/images/pkg/container"
2929
"github.com/osbuild/images/pkg/distro/bootc"
30-
"github.com/osbuild/images/pkg/dnfjson"
30+
"github.com/osbuild/images/pkg/depsolvednf"
3131
"github.com/osbuild/images/pkg/experimentalflags"
3232
"github.com/osbuild/images/pkg/manifest"
3333
"github.com/osbuild/images/pkg/manifestgen"
@@ -93,15 +93,15 @@ func inContainerOrUnknown() bool {
9393
return err == nil
9494
}
9595

96-
func makeManifest(c *ManifestConfig, solver *dnfjson.Solver, cacheRoot string) (manifest.OSBuildManifest, map[string][]rpmmd.RepoConfig, error) {
96+
func makeManifest(c *ManifestConfig, solver *depsolvednf.Solver, cacheRoot string) (manifest.OSBuildManifest, map[string][]rpmmd.RepoConfig, error) {
9797
rng := createRand()
9898
mani, err := manifestForISO(c, rng)
9999
if err != nil {
100100
return nil, nil, fmt.Errorf("cannot get manifest: %w", err)
101101
}
102102

103103
// depsolve packages
104-
depsolvedSets := make(map[string]dnfjson.DepsolveResult)
104+
depsolvedSets := make(map[string]depsolvednf.DepsolveResult)
105105
depsolvedRepos := make(map[string][]rpmmd.RepoConfig)
106106
for name, pkgSet := range mani.GetPackageSetChains() {
107107
res, err := solver.Depsolve(pkgSet, 0)

bib/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/hashicorp/go-version v1.7.0
1010
github.com/osbuild/blueprint v1.13.0
1111
github.com/osbuild/image-builder-cli v0.0.0-20250331194259-63bb56e12db3
12-
github.com/osbuild/images v0.189.0
12+
github.com/osbuild/images v0.191.0
1313
github.com/sirupsen/logrus v1.9.3
1414
github.com/spf13/cobra v1.10.1
1515
github.com/spf13/pflag v1.0.10

bib/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ github.com/osbuild/blueprint v1.13.0 h1:blo22+S2ZX5bBmjGcRveoTUrV4Ms7kLfKyb32Wyu
245245
github.com/osbuild/blueprint v1.13.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4=
246246
github.com/osbuild/image-builder-cli v0.0.0-20250331194259-63bb56e12db3 h1:M3yYunKH4quwJLQrnFo7dEwCTKorafNC+AUqAo7m5Yo=
247247
github.com/osbuild/image-builder-cli v0.0.0-20250331194259-63bb56e12db3/go.mod h1:0sEmiQiMo1ChSuOoeONN0RmsoZbQEvj2mlO2448gC5w=
248-
github.com/osbuild/images v0.189.0 h1:fG9J9bxhdzkKkZ2EpW/LzT0YQBXY/kKiT99UpEzZhCo=
249-
github.com/osbuild/images v0.189.0/go.mod h1:KPiYBF0VrOXz5NAw6Lv4X170uN8wnOHpWuBzKT4jPrU=
248+
github.com/osbuild/images v0.191.0 h1:nhTIAf0JJTEf1gIUsU1II0BVIYBj537BvDpBBXCLYig=
249+
github.com/osbuild/images v0.191.0/go.mod h1:KPiYBF0VrOXz5NAw6Lv4X170uN8wnOHpWuBzKT4jPrU=
250250
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
251251
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
252252
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

0 commit comments

Comments
 (0)