ulri: Fix a crash on build failure

2 files changed, 9 insertions, 6 deletions

diff --git a/NEWS b/NEWS
index 74be710..09666e5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- ulri: Fix a crash on build failure. This caused to not send failure emails
+  and not cleanup packages for other architectures.
+
 0.9.2
 - iurt: Improve logging
 - iurt: recreate .src.rpm using --target <arch> to fix installing BRs using %{?_isa} macro on armv7hl
diff --git a/lib/Iurt/Ulri.pm b/lib/Iurt/Ulri.pm
index 09be6b0..8453c86 100755
--- a/lib/Iurt/Ulri.pm
+++ b/lib/Iurt/Ulri.pm
@@ -299,19 +299,19 @@ sub warn_about_failure {
     $fpath =~ tr!/!!s;             # Squash double slashes ...
     $fpath =~ s!/!//!;           # ... except for http://
 
-    $text .= "\nFailure details available in $fpath/log\n";
+    $text .= "\nFailure details available in $fpath/\n";
     $text .= "Reason:\n";
-    $text .= read_file("$fail_dir/$prefix/log/status.log");
+    $text .= read_file("$fail_dir/$prefix/status.log");
     $text .= "\nLog files generated:\n";
 
-    opendir my $DP1, "$fail_dir/$prefix/log/";
+    opendir my $DP1, "$fail_dir/$prefix/";
     foreach my $f1 (readdir($DP1)) {
-        next if ! -d "$fail_dir/$prefix/log/$f1" || $f1 =~ m/^\./;
+        next if ! -d "$fail_dir/$prefix/$f1" || $f1 =~ m/^\./;
 
-        opendir my $DP2, "$fail_dir/$prefix/log/$f1";
+        opendir my $DP2, "$fail_dir/$prefix/$f1";
         foreach my $f2 (sort(readdir $DP2)) {
             next if $f2 =~ m/^\./;
-            $text .= "$fpath/log/$f1/$f2\n";
+            $text .= "$fpath/$f1/$f2\n";
         }
         closedir $DP2;
     }