From 1689aa1152bb8861a9c4a3e607098100dd815bfe Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <dbd@ehtrace.com>
Date: Fri, 11 Feb 2022 18:00:17 +0100
Subject: [PATCH] Update to 2022-02-11 18:00

---
 roles/rpm_build_server/files/watcher.pl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/roles/rpm_build_server/files/watcher.pl b/roles/rpm_build_server/files/watcher.pl
index 056a153..022e5d8 100644
--- a/roles/rpm_build_server/files/watcher.pl
+++ b/roles/rpm_build_server/files/watcher.pl
@@ -152,13 +152,13 @@ sub handle_submit {
     make_path($result);
     my $mock_msg;
     foreach my $out (qx(mock -r $target-$arch --resultdir=$result $srpm 2>&1)){
-      chomp $out;
       $mock_msg .= $out;
+      chomp $out;
       log_info("[$job_id] $out");
     }
     if ($? != 0) {
       log_info("[$job_id] Build submited by $submiter failed");
-      handle_error($job_id, 'Mock build', $mock_msg);
+      handle_error($job_id, 'Mock build', $mock_msg, $email);
       return;
     }
     my $repo_dir = $conf->{paths}->{repo};
@@ -179,7 +179,7 @@ sub handle_submit {
         qx(rpm --addsign $built_pkg);
         if ($? != 0) {
           log_info("[$job_id] Signing failed");
-          handle_error($job_id, 'Package signature error', "Command rpm --addsign $built_pkg failed");
+          handle_error($job_id, 'Package signature error', "Command rpm --addsign $built_pkg failed", $email);
           return;
         }
         # Open the package without checking the signature, as the key might not be present in the
@@ -207,7 +207,8 @@ sub handle_submit {
       handle_error(
         $job_id,
         'Createrepo error',
-        "Command createrepo --checksum sha -x \"*debuginfo*\" --update -c $repo_cache_dir $repo_dir"
+        "Command createrepo --checksum sha -x \"*debuginfo*\" --update -c $repo_cache_dir $repo_dir",
+	$email
       );
       return;
     }
@@ -230,7 +231,7 @@ sub handle_submit {
         }
         if ($? != 0) {
           log_info("[$job_id] Syncing to $mirror->{dest} failed");
-          handle_error($job_id, 'Mirror update error', "Command $rsync_cmd failed");
+          handle_error($job_id, 'Mirror update error', "Command $rsync_cmd failed", $email);
           return;
         }
       }