From 1297d71125f5a694996147406edf38bdc913396c Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 18 Jan 2021 16:31:40 -0500 Subject: [PATCH] 16306: Use cwd as default source tree. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- cmd/arvados-package/cmd.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/arvados-package/cmd.go b/cmd/arvados-package/cmd.go index 6cf3ba3c0a..b0c0e9e3c7 100644 --- a/cmd/arvados-package/cmd.go +++ b/cmd/arvados-package/cmd.go @@ -68,7 +68,8 @@ type opts struct { func parseFlags(args []string) (opts, error) { opts := opts{ - TargetOS: "debian:10", + SourceDir: ".", + TargetOS: "debian:10", } flags := flag.NewFlagSet("", flag.ContinueOnError) flags.StringVar(&opts.PackageVersion, "package-version", opts.PackageVersion, "package version to build/test, like \"1.2.3\"") @@ -123,5 +124,9 @@ Options: opts.SourceDir = d } opts.PackageDir = filepath.Clean(opts.PackageDir) + opts.SourceDir, err = filepath.Abs(opts.SourceDir) + if err != nil { + return opts, err + } return opts, nil } -- 2.30.2