merge branch 'pr-247'

  vendor: switch to vndr for vendoring
  vendor: update all dependencies to latest version
  hack: remove opencontainers/runtime-tools patch
  hack: remove pkg/errors patch
  cmd: fix 'go vet' warnings

LGTMs: @cyphar
Closes #247

Makefile

@@ -70,10 +70,6 @@ install: $(GO_SRC)
 install.static: $(GO_SRC)
 	$(GO) install -v ${STATIC_BUILD_FLAGS} ${CMD}
 
-.PHONY: update-deps
-update-deps:
-	hack/vendor.sh
-
 .PHONY: clean
 clean:
 	rm -f umoci umoci.static umoci.cov*

cmd/umoci/main.go

@@ -90,12 +90,7 @@ func main() {
 		if err != nil {
 			return errors.Wrap(err, "parsing log level")
 		}
-
 		log.SetLevel(level)
-
-		if level == log.DebugLevel {
-			errors.Debug(true)
-		}
 		return nil
 	}
 
@@ -160,5 +155,6 @@ func main() {
 			log.Info("umoci encountered a permission error: maybe --rootless will help?")
 		}
 		log.Fatalf("%v", err)
+		log.Debugf("%+v", err)
 	}
 }

cmd/umoci/utils.go

@@ -300,14 +300,14 @@ func parseIdmapOptions(meta *UmociMeta, ctx *cli.Context) error {
 	for _, uidmap := range ctx.StringSlice("uid-map") {
 		idMap, err := idtools.ParseMapping(uidmap)
 		if err != nil {
-			return errors.Wrapf(err, "failure parsing --uid-map %s: %s", uidmap)
+			return errors.Wrapf(err, "failure parsing --uid-map %s", uidmap)
 		}
 		meta.MapOptions.UIDMappings = append(meta.MapOptions.UIDMappings, idMap)
 	}
 	for _, gidmap := range ctx.StringSlice("gid-map") {
 		idMap, err := idtools.ParseMapping(gidmap)
 		if err != nil {
-			return errors.Wrapf(err, "failure parsing --gid-map %s: %s", gidmap)
+			return errors.Wrapf(err, "failure parsing --gid-map %s", gidmap)
 		}
 		meta.MapOptions.GIDMappings = append(meta.MapOptions.GIDMappings, idMap)
 	}