lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

engine: resources: pkg: Simplify state check

Browse Source 
Refactor this code.
This commit is contained in:
James Shubin
2018-12-28 20:33:51 -05:00
parent a69a7009f8
commit 9ff21b68e4
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/resources/pkg.go
View File

@@ -554,9 +554,8 @@ func (obj *PkgRes) GroupCmp(r engine.GroupableRes) error {
if !ok { if !ok {
return fmt.Errorf("resource is not the same kind") return fmt.Errorf("resource is not the same kind")
} }
objStateIsVersion := (obj.State != PkgStateInstalled && obj.State != PkgStateUninstalled && obj.State != PkgStateNewest) // must be a ver. string // TODO: what should we do about the empty string?
resStateIsVersion := (res.State != PkgStateInstalled && res.State != PkgStateUninstalled && res.State != PkgStateNewest) // must be a ver. string if stateIsVersion(obj.State) || stateIsVersion(res.State) {
if objStateIsVersion || resStateIsVersion {
// can't merge specific version checks atm // can't merge specific version checks atm
return fmt.Errorf("resource uses a version string") return fmt.Errorf("resource uses a version string")
} }
@@ -605,3 +604,10 @@ func ReturnSvcInFileList(fileList []string) []string {
} }
return result return result
} }
// stateIsVersion is a simple test to see if the state string is an existing
// well-known flag.
// TODO: what should we do about the empty string?
func stateIsVersion(state string) bool {
return (state != PkgStateInstalled && state != PkgStateUninstalled && state != PkgStateNewest) // must be a ver. string
}