From 56dba1737921b1e3bdb3370ba3b6c98df80a0c4d Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Fri, 22 Dec 2017 19:54:50 +0000
Subject: Add error message before we die due to unresolved conflicts.

---
 lib/MGA/DrakISO/BuildClassic.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/MGA/DrakISO/BuildClassic.pm b/lib/MGA/DrakISO/BuildClassic.pm
index 384a64f..86eaebd 100755
--- a/lib/MGA/DrakISO/BuildClassic.pm
+++ b/lib/MGA/DrakISO/BuildClassic.pm
@@ -446,7 +446,7 @@ sub handle_conflicts {
         }
     }
     if ($errors) {
-        die if !$::force;
+        $::force or die "ERROR: not all conflicts or dependencies could be resolved.\n";
         print "NOTE: **** continuing due to --force option           ****\n";
         print "NOTE: **** this ISO is not suitable for final release ****\n";
     }
-- 
cgit v1.2.1