зеркало из https://github.com/mozilla/mig.git
Fixing some compilation errors that didn't show up in 'make test' for some reason
This commit is contained in:
Родитель
bb9abd0fe1
Коммит
dc31522066
|
@ -94,7 +94,7 @@ func getIdent() (string, error) {
|
|||
name: "getLSBRelease",
|
||||
successLog: "using lsb release for distribution ident",
|
||||
findFn: getLSBRelease,
|
||||
validateFn: func(_ string, err error) { return err != nil },
|
||||
validateFn: func(_ string, err error) bool { return err != nil },
|
||||
},
|
||||
{
|
||||
// Here we check that we read more than '\S'.
|
||||
|
@ -102,13 +102,13 @@ func getIdent() (string, error) {
|
|||
name: "getIssue",
|
||||
successLog: "using /etc/issue for distribution ident",
|
||||
findFn: getIssue,
|
||||
validateFn: func(issueName string, err error) { return err != nil && len(issueName) > 3 },
|
||||
validateFn: func(issueName string, err error) bool { return err != nil && len(issueName) > 3 },
|
||||
},
|
||||
{
|
||||
name: "getOSRelease",
|
||||
successLog: "using /etc/os-release for distribution ident",
|
||||
findFn: getOSRelease,
|
||||
validateFn: func(_ string, err error) { return err != nil },
|
||||
validateFn: func(_ string, err error) bool { return err != nil },
|
||||
},
|
||||
}
|
||||
|
||||
|
@ -118,7 +118,7 @@ func getIdent() (string, error) {
|
|||
logChan <- mig.Log{Desc: findMethod.successLog}.Debug()
|
||||
return ident, nil
|
||||
}
|
||||
logChan <- mig.Log{Desc: fmt.Errorf("%s failed: %v", findMethod.name, err)}.Debug()
|
||||
logChan <- mig.Log{Desc: fmt.Sprintf("%s failed: %v", findMethod.name, err)}.Debug()
|
||||
}
|
||||
|
||||
return "", fmt.Errorf("none of the configured methods for detecting the host's ident worked")
|
||||
|
|
Загрузка…
Ссылка в новой задаче