kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use plflag, not flag 

Make it harder to accidentally mess this up again.
This commit is contained in:
Tim Hockin 2021-06-22 09:50:53 -07:00
parent c6878026a1
commit 476fba3d3e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/git-sync/main.go
View File

@ -22,7 +22,7 @@ import (
"bytes" "bytes"
"context" "context"
"encoding/json" "encoding/json"
"flag" stdflag "flag" // renamed so we don't accidentally use it
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
@ -84,7 +84,7 @@ var flChmod = pflag.Int("change-permissions", envInt("GIT_SYNC_PERMISSIONS", 0),
var flSyncHookCommand = pflag.String("sync-hook-command", envString("GIT_SYNC_HOOK_COMMAND", ""), var flSyncHookCommand = pflag.String("sync-hook-command", envString("GIT_SYNC_HOOK_COMMAND", ""),
"an optional command to be executed after syncing a new hash of the remote repository") "an optional command to be executed after syncing a new hash of the remote repository")
var flSparseCheckoutFile = flag.String("sparse-checkout-file", envString("GIT_SYNC_SPARSE_CHECKOUT_FILE", ""), var flSparseCheckoutFile = pflag.String("sparse-checkout-file", envString("GIT_SYNC_SPARSE_CHECKOUT_FILE", ""),
"the path to a sparse-checkout file") "the path to a sparse-checkout file")
var flWebhookURL = pflag.String("webhook-url", envString("GIT_SYNC_WEBHOOK_URL", ""), var flWebhookURL = pflag.String("webhook-url", envString("GIT_SYNC_WEBHOOK_URL", ""),
@ -341,14 +341,14 @@ func envDuration(key string, def time.Duration) time.Duration {
func setGlogFlags() { func setGlogFlags() {
// Force logging to stderr. // Force logging to stderr.
stderrFlag := flag.Lookup("logtostderr") stderrFlag := stdflag.Lookup("logtostderr")
if stderrFlag == nil { if stderrFlag == nil {
handleError(false, "ERROR: can't find glog flag 'logtostderr'") handleError(false, "ERROR: can't find glog flag 'logtostderr'")
} }
stderrFlag.Value.Set("true") stderrFlag.Value.Set("true")
// Set verbosity from flag. // Set verbosity from flag.
vFlag := flag.Lookup("v") vFlag := stdflag.Lookup("v")
if vFlag == nil { if vFlag == nil {
fmt.Fprintf(os.Stderr, "ERROR: can't find glog flag 'v'\n") fmt.Fprintf(os.Stderr, "ERROR: can't find glog flag 'v'\n")
os.Exit(1) os.Exit(1)
@ -388,7 +388,7 @@ func main() {
// //
pflag.Parse() pflag.Parse()
flag.CommandLine.Parse(nil) // Otherwise glog complains stdflag.CommandLine.Parse(nil) // Otherwise glog complains
setGlogFlags() setGlogFlags()
log = &customLogger{glogr.New(), *flRoot, *flErrorFile} log = &customLogger{glogr.New(), *flRoot, *flErrorFile}