1 files changed, 37 insertions, 30 deletions
diff --git a/guix-build-coordinator/hooks.scm b/guix-build-coordinator/hooks.scm
index 02c4857..a31b804 100644
--- a/guix-build-coordinator/hooks.scm
+++ b/guix-build-coordinator/hooks.scm
@@ -79,6 +79,7 @@
           #:key
           (public-key  (read-file-sexp %public-key-file))
           (private-key (read-file-sexp %private-key-file))
+          (narinfo-directory publish-directory)
           post-publish-hook)
   (mkdir-p (string-append publish-directory "/nar/lzip"))
 
@@ -110,7 +111,7 @@
                                 ".narinfo"))
 
                 (narinfo-location
-                 (string-append publish-directory "/"
+                 (string-append narinfo-directory "/"
                                 narinfo-filename)))
 
            (unless (file-exists? narinfo-location)
@@ -153,6 +154,7 @@
           #:key
           (aws-command "aws")
           (command-line-arguments '())
+          (narinfo-directory #f)
           (public-key  (read-file-sexp %public-key-file))
           (private-key (read-file-sexp %private-key-file))
           post-publish-hook)
@@ -176,40 +178,45 @@
 
     (build-success-publish-hook
      temp-dir
+     #:narinfo-directory (or narinfo-directory temp-dir)
      #:public-key public-key
      #:private-key private-key
      #:post-publish-hook
      (lambda (directory narinfo-filename nar-filename)
-       (unless (s3-file-exists? narinfo-filename)
-         (retry-on-error
-          (lambda ()
-            (s3-cp s3-bucket
-                   (string-append directory "/" nar-filename)
-                   nar-filename
-                   #:command aws-command
-                   #:command-line-arguments
-                   command-line-arguments))
-          #:times 6
-          #:delay 20)
-
-         (when post-publish-hook
-           (post-publish-hook directory
-                              narinfo-filename
-                              nar-filename))
-
-         (retry-on-error
-          (lambda ()
-            (s3-cp s3-bucket
-                   (string-append directory "/" narinfo-filename)
-                   narinfo-filename
-                   #:command aws-command
-                   #:command-line-arguments
-                   command-line-arguments))
-          #:times 6
-          #:delay 20))
+       (let ((narinfo-full-filename
+              (string-append (or narinfo-directory temp-dir)
+                             "/" narinfo-filename)))
+         (unless (s3-file-exists? narinfo-filename)
+           (retry-on-error
+            (lambda ()
+              (s3-cp s3-bucket
+                     (string-append directory "/" nar-filename)
+                     nar-filename
+                     #:command aws-command
+                     #:command-line-arguments
+                     command-line-arguments))
+            #:times 6
+            #:delay 20)
+
+           (when post-publish-hook
+             (post-publish-hook directory
+                                narinfo-filename
+                                nar-filename))
 
-       (delete-file (string-append directory "/" narinfo-filename))
-       (delete-file (string-append directory "/" nar-filename))))))
+           (retry-on-error
+            (lambda ()
+              (s3-cp s3-bucket
+                     narinfo-full-filename
+                     narinfo-filename
+                     #:command aws-command
+                     #:command-line-arguments
+                     command-line-arguments))
+            #:times 6
+            #:delay 20))
+
+         (unless narinfo-directory
+           (delete-file narinfo-full-filename))
+         (delete-file (string-append directory "/" nar-filename)))))))
 
 (define (default-build-failure-hook build-coordinator build-id)
   (define datastore