public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skopeo: 0.1.18 -> 0.1.22 fix whitespace

Browse Source
This commit is contained in:
Christian Albrecht 2017-06-29 08:54:52 +02:00
parent 05e9c47dc3
commit dd484418a1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/tools/skopeo/path.patch
View File

@ -6,7 +6,7 @@ index 50e29b2..7108df5 100644
import ( import (
"fmt" "fmt"
"os" "os"
+ "path/filepath" + "path/filepath"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/containers/image/signature" "github.com/containers/image/signature"
@ -14,11 +14,11 @@ index 50e29b2..7108df5 100644
policyPath := c.GlobalString("policy") policyPath := c.GlobalString("policy")
var policy *signature.Policy // This could be cached across calls, if we had an application context. var policy *signature.Policy // This could be cached across calls, if we had an application context.
var err error var err error
+ var dir string + var dir string
+ if policyPath == "" { + if policyPath == "" {
+ dir, err = filepath.Abs(filepath.Dir(os.Args[0])) + dir, err = filepath.Abs(filepath.Dir(os.Args[0]))
+ policyPath = dir + "/../etc/default-policy.json" + policyPath = dir + "/../etc/default-policy.json"
+ } + }
if c.GlobalBool("insecure-policy") { if c.GlobalBool("insecure-policy") {
policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}} policy = &signature.Policy{Default: []signature.PolicyRequirement{signature.NewPRInsecureAcceptAnything()}}
} else if policyPath == "" { } else if policyPath == "" {