mirror
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1662 from ebastos/version_password 

Skip checking for password file issue #1632
This commit is contained in:
Alexander Neumann 2018-03-09 20:42:32 +01:00
parent ab5ef600a2 b9d643358a
commit 7f8e269891
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/restic/main.go
View File

@ -29,14 +29,16 @@ directories in an encrypted repository stored on different backends.
SilenceUsage: true, SilenceUsage: true,
DisableAutoGenTag: true, DisableAutoGenTag: true,
PersistentPreRunE: func(*cobra.Command, []string) error { PersistentPreRunE: func(c *cobra.Command, args []string) error {
// parse extended options // parse extended options
opts, err := options.Parse(globalOptions.Options) opts, err := options.Parse(globalOptions.Options)
if err != nil { if err != nil {
return err return err
} }
globalOptions.extended = opts globalOptions.extended = opts
if c.Name() == "version" {
return nil
}
pwd, err := resolvePassword(globalOptions, "RESTIC_PASSWORD") pwd, err := resolvePassword(globalOptions, "RESTIC_PASSWORD")
if err != nil { if err != nil {
fmt.Fprintf(os.Stderr, "Resolving password failed: %v\n", err) fmt.Fprintf(os.Stderr, "Resolving password failed: %v\n", err)