ccwl: Use key name for output.

The key may have been renamed. So, the output should likewise be.

* ccwl/ccwl.scm (key->output): Use key name for output.

1 files changed, 10 insertions, 7 deletions

diff --git a/ccwl/ccwl.scm b/ccwl/ccwl.scm
index 9bbece3..17cf27c 100644
--- a/ccwl/ccwl.scm
+++ b/ccwl/ccwl.scm
@@ -539,13 +539,16 @@ a <key> object, in STEPS, a list of <step> objects. If no such
                                        (eq? (step-id step)
                                             (key-step key)))
                                      steps)))
-    (with-syntax ((key-cwl-id (datum->syntax #f (key-cwl-id key))))
-      #`(set-output-source (find (lambda (output)
-                                   (eq? (output-id output)
-                                        'key-cwl-id))
-                                 (function-outputs
-                                  #,(step-run step-with-output)))
-                           #,(cwl-key-address key)))))
+    (with-syntax ((key-name (datum->syntax #f (key-name key)))
+                  (key-cwl-id (datum->syntax #f (key-cwl-id key))))
+      #`(set-output-id
+         (set-output-source (find (lambda (output)
+                                    (eq? (output-id output)
+                                         'key-cwl-id))
+                                  (function-outputs
+                                   #,(step-run step-with-output)))
+                            #,(cwl-key-address key))
+         'key-name))))
 
 (define-syntax workflow
   (lambda (x)