From b777cee2a0e5bb2d6c2d552d11c59672b0db8aa7 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Mon, 10 Sep 2018 12:33:54 +0300
Subject: Adjust package submission result manifest message

---
 brep/handler/submit/submit-dir.in |  6 +++---
 brep/handler/submit/submit-git.in | 26 ++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 7 deletions(-)

(limited to 'brep/handler')

diff --git a/brep/handler/submit/submit-dir.in b/brep/handler/submit/submit-dir.in
index 685cf06..1f677e4 100644
--- a/brep/handler/submit/submit-dir.in
+++ b/brep/handler/submit/submit-dir.in
@@ -100,9 +100,9 @@ fi
 
 if [ -n "$simulate" ]; then
   run rm -r "$data_dir"
-  trace "$name/$version submission is simulated"
+  trace "package submission is simulated: $name/$version"
 else
-  trace "$name/$version submission is queued"
+  trace "package submission is queued: $name/$version"
 fi
 
-exit_with_manifest 200 "$name/$version submission is queued"
+exit_with_manifest 200 "package submission is queued: $name/$version"
diff --git a/brep/handler/submit/submit-git.in b/brep/handler/submit/submit-git.in
index bc8ecf0..cc9927b 100644
--- a/brep/handler/submit/submit-git.in
+++ b/brep/handler/submit/submit-git.in
@@ -161,6 +161,12 @@
 #   Email to use for the target repository commits. noreply@example.com if
 #   unspecified.
 #
+# --result-url <url>
+#
+#   Result URL base for the response. If specified, the handler will append
+#   the <package>/<version> to this value and include the resulting URL in the
+#   response message.
+#
 usage="usage: $0 [<options>] <tgt-repo> [<ref-repo>] <dir>"
 
 # Diagnostics.
@@ -190,6 +196,7 @@ set -o errtrace # Trap ERR in functions.
 #
 committer_name="Submission Handler"
 committer_email="noreply@example.com"
+result_url=
 
 while [ $# -gt 0 ]; do
   case $1 in
@@ -203,6 +210,11 @@ while [ $# -gt 0 ]; do
       committer_email="$1"
       shift
       ;;
+    --result-url)
+      shift
+      result_url="${1%/}"
+      shift
+      ;;
     *)
       break; # The end of options is encountered.
       ;;
@@ -367,6 +379,12 @@ if [ -z "$project" ]; then
   project="$name"
 fi
 
+if [ -n "$result_url" ]; then
+  message_suffix=": $result_url/$name/$version"
+else
+  message_suffix=": $name/$version"
+fi
+
 # Exit with the 'submission is queued' result manifest if simulating.
 #
 # Note that we can't expect a real control repository URL to be specified for
@@ -375,8 +393,8 @@ fi
 if [ -n "$simulate" ]; then
   run rm -r -f "$data_dir"
 
-  trace "$name/$version submission is simulated"
-  exit_with_manifest 200 "$name/$version submission is queued" "$reference"
+  trace "package submission is simulated$message_suffix"
+  exit_with_manifest 200 "package submission is queued$message_suffix"
 fi
 
 function git_add () # <repo-dir> <path>...
@@ -655,5 +673,5 @@ fi
 #
 run rm -r -f "$data_dir"
 
-trace "$name/$version submission is queued"
-exit_with_manifest 200 "$name/$version submission is queued"
+trace "package submission is queued$message_suffix"
+exit_with_manifest 200 "package submission is queued$message_suffix"
-- 
cgit v1.1