From 8e110d32399ab1c3db08e18f015b3e7e092a27de Mon Sep 17 00:00:00 2001 From: Manuel Naranjo Date: Thu, 4 Jan 2024 09:22:51 +0100 Subject: [PATCH] bzlmod: track of ignored dependencies Now we also track ignored dependencies --- cmd/rpmtree.go | 1 + pkg/bazel/bzlmod.go | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/rpmtree.go b/cmd/rpmtree.go index fd5800f..f37f2c6 100644 --- a/cmd/rpmtree.go +++ b/cmd/rpmtree.go @@ -208,6 +208,7 @@ func loadBzlModLockFile() (*bazel.BzlModLockFile, error) { Name: rpmtreeopts.name, BuildFile: rpmtreeopts.buildfile, Arch: rpmtreeopts.arch, + ForceIgnoreWithDependencies: rpmtreeopts.forceIgnoreRegex, }, nil } diff --git a/pkg/bazel/bzlmod.go b/pkg/bazel/bzlmod.go index 017bc5e..8cd65fd 100644 --- a/pkg/bazel/bzlmod.go +++ b/pkg/bazel/bzlmod.go @@ -46,6 +46,7 @@ type LockFileArgs struct { Path string; Bazeldnf string; GeneratedVisibility []string; + ForceIgnoreWithDependencies []string; } func getStringValue(arg *build.AssignExpr) (string, bool) { @@ -332,11 +333,12 @@ RepoFiles []string `json:"repo-files"` Arch string `json:"arch"` Required []string `json:"required"` Version int `json:"version"` +ForceIgnoreWithDependencies []string `json:"force-ignore-with-dependencies"` Rpms []BzlModLockFileRPM `json:"rpms"` } -const CURRENT_LOCK_FILE_VERSION = 1 +const CURRENT_LOCK_FILE_VERSION = 2 func LoadBzlModLockFile(path string) (*BzlModLockFile, error) { _, err := os.Stat(path)