[arvados] updated: 2.1.0-2869-g0840aec1e

[git repository hosting]

Summary of changes:
 cmd/arvados-package/build.go | 7 +++++++
 cmd/arvados-package/fpm.go   | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)

       via  0840aec1ec6fdcce4d1a317578bc1f5f5be1a1f6 (commit)
      from  ee158449ac8cc70708a161cd36845f57b5a248f1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0840aec1ec6fdcce4d1a317578bc1f5f5be1a1f6
Author: Tom Clegg <tom at curii.com>
Date:   Thu Sep 8 10:19:01 2022 -0400

    17344: Run `ls -l newpkg.deb` on host instead of container.
    
    This way the displayed path reflects the final package location on the
    host, rather than the path inside the fpm container where the build
    command's tempdir is bind-mounted.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/cmd/arvados-package/build.go b/cmd/arvados-package/build.go
index 9841c890b..2ce8a6743 100644
--- a/cmd/arvados-package/build.go
+++ b/cmd/arvados-package/build.go
@@ -133,6 +133,13 @@ func build(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Wr
 	if err != nil {
 		return err
 	}
+	cmd = exec.CommandContext(ctx, "ls", "-l", opts.PackageDir+"/"+packageFilename)
+	cmd.Stdout = stdout
+	cmd.Stderr = stderr
+	err = cmd.Run()
+	if err != nil {
+		return err
+	}
 
 	return nil
 }
diff --git a/cmd/arvados-package/fpm.go b/cmd/arvados-package/fpm.go
index 64d0adabe..0b13b15c1 100644
--- a/cmd/arvados-package/fpm.go
+++ b/cmd/arvados-package/fpm.go
@@ -142,10 +142,5 @@ func fpm(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writ
 		}
 	}
 
-	cmd = exec.Command("ls", "-l", pkgfile)
-	cmd.Stdout = stdout
-	cmd.Stderr = stderr
-	_ = cmd.Run()
-
 	return nil
 }

-----------------------------------------------------------------------


hooks/post-receive
--