diff options
| -rw-r--r-- | main.go | 27 |
1 files changed, 19 insertions, 8 deletions
@@ -37,14 +37,8 @@ func main() { all := forge.Repos.SortByGoPath() for all.Scan() { check = all.Next() - if argv.Force { - if err := doForce(check); err != nil { - // badExit(check, err) - } - } else { - if err := doSmart(check); err != nil { - // badExit(check, err) - } + if err := doMain(check); err != nil { + badExit(check, err) } } } else { @@ -55,6 +49,9 @@ func main() { badExit(nil, nil) } + if err := doMain(check); err != nil { + badExit(check, err) + } if argv.Force { if err := doForce(check); err != nil { badExit(check, err) @@ -140,3 +137,17 @@ func restoreFromGoPkg(repo *gitpb.Repo) error { // try go.sum, but no error checking since it might not be there return nil } + +func doMain(repo *gitpb.Repo) error { + if argv.Strict { + return doStrict(repo) + } + if argv.Force { + err := doForce(repo) + return err + } + + // if --force or --strict is not set, fall back to a "smart" guess + // at what the user probably would want + return doSmart(repo) +} |