getFdeFiles: wrap errors that are returned (MR 22)
this adds some context around the errors that this function can return
This commit is contained in:
18
main.go
18
main.go
@@ -334,7 +334,7 @@ func getFdeFiles(files misc.StringSet, devinfo deviceinfo.DeviceInfo) error {
|
|||||||
}
|
}
|
||||||
// TODO: this shouldn't be false? though some files (pointercal) don't always exist...
|
// TODO: this shouldn't be false? though some files (pointercal) don't always exist...
|
||||||
if err := getFiles(files, confFiles, false); err != nil {
|
if err := getFiles(files, confFiles, false); err != nil {
|
||||||
return err
|
return fmt.Errorf("getFdeFiles: failed to add files: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// osk-sdl
|
// osk-sdl
|
||||||
@@ -343,12 +343,12 @@ func getFdeFiles(files misc.StringSet, devinfo deviceinfo.DeviceInfo) error {
|
|||||||
"/sbin/cryptsetup": false,
|
"/sbin/cryptsetup": false,
|
||||||
"/usr/lib/libGL.so.1": false}
|
"/usr/lib/libGL.so.1": false}
|
||||||
if err := getFiles(files, oskFiles, true); err != nil {
|
if err := getFiles(files, oskFiles, true); err != nil {
|
||||||
return err
|
return fmt.Errorf("getFdeFiles: failed to add files: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
fontFile, err := getOskConfFontPath("/etc/osk.conf")
|
fontFile, err := getOskConfFontPath("/etc/osk.conf")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return fmt.Errorf("getFdeFiles: failed to add file %q: %w", fontFile, err)
|
||||||
}
|
}
|
||||||
files[fontFile] = false
|
files[fontFile] = false
|
||||||
|
|
||||||
@@ -361,11 +361,10 @@ func getFdeFiles(files misc.StringSet, devinfo deviceinfo.DeviceInfo) error {
|
|||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Print("getBinaryDeps: failed to stat file")
|
return fmt.Errorf("getFdeFiles: failed to add file %w", err)
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
if err := getFiles(files, dfbFiles, true); err != nil {
|
if err := getFiles(files, dfbFiles, true); err != nil {
|
||||||
return err
|
return fmt.Errorf("getFdeFiles: failed to add files: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// tslib
|
// tslib
|
||||||
@@ -377,15 +376,14 @@ func getFdeFiles(files misc.StringSet, devinfo deviceinfo.DeviceInfo) error {
|
|||||||
return nil
|
return nil
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Print("getBinaryDeps: failed to stat file")
|
return fmt.Errorf("getFdeFiles: failed to add file: %w", err)
|
||||||
return err
|
|
||||||
}
|
}
|
||||||
libts, _ := filepath.Glob("/usr/lib/libts*")
|
libts, _ := filepath.Glob("/usr/lib/libts*")
|
||||||
for _, file := range libts {
|
for _, file := range libts {
|
||||||
tslibFiles[file] = false
|
tslibFiles[file] = false
|
||||||
}
|
}
|
||||||
if err = getFiles(files, tslibFiles, true); err != nil {
|
if err = getFiles(files, tslibFiles, true); err != nil {
|
||||||
return err
|
return fmt.Errorf("getFdeFiles: failed to add files: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// mesa hw accel
|
// mesa hw accel
|
||||||
@@ -398,7 +396,7 @@ func getFdeFiles(files misc.StringSet, devinfo deviceinfo.DeviceInfo) error {
|
|||||||
"/usr/lib/xorg/modules/dri/" + devinfo.MesaDriver + "_dri.so": false,
|
"/usr/lib/xorg/modules/dri/" + devinfo.MesaDriver + "_dri.so": false,
|
||||||
}
|
}
|
||||||
if err := getFiles(files, mesaFiles, true); err != nil {
|
if err := getFiles(files, mesaFiles, true); err != nil {
|
||||||
return err
|
return fmt.Errorf("getFdeFiles: failed to add files: %w", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user