kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Resolve issues identifies by staticcheck

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-02-06 21:49:35 -07:00
parent 3f652ceb02
commit a0179f1432
18 changed files with 895 additions and 1501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/pkg/image/build.go
View File

@@ -34,7 +34,7 @@ func Build(name string, buildForce bool) error {
var err error
ignore, err = util.ReadFile(excludes_file)
if err != nil {
return fmt.Errorf("Failed creating directory: %s: %w", imagePath, err)
return fmt.Errorf("failed creating directory: %s: %w", imagePath, err)
}
}

14
internal/pkg/image/initramfs.go
View File

@@ -28,8 +28,8 @@ type Initramfs struct {
imageName string
}
func (this *Initramfs) version() *version.Version {
matches := versionPattern.FindAllString(this.Path, -1)
func (initrd *Initramfs) version() *version.Version {
matches := versionPattern.FindAllString(initrd.Path, -1)
for i := len(matches) - 1; i >= 0; i-- {
if version_, err := version.NewVersion(strings.TrimSuffix(matches[i], ".")); err == nil {
return version_
@@ -38,8 +38,8 @@ func (this *Initramfs) version() *version.Version {
return nil
}
func (this *Initramfs) Version() string {
version := this.version()
func (initrd *Initramfs) Version() string {
version := initrd.version()
if version == nil {
return ""
} else {
@@ -47,9 +47,9 @@ func (this *Initramfs) Version() string {
}
}
func (this *Initramfs) FullPath() string {
root := RootFsDir(this.imageName)
return filepath.Join(root, this.Path)
func (initrd *Initramfs) FullPath() string {
root := RootFsDir(initrd.imageName)
return filepath.Join(root, initrd.Path)
}
func FindInitramfsFromPattern(imageName string, version string, pattern string) (initramfs *Initramfs) {