diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 19:54:50 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 20:39:24 +0000 |
| commit | 56dba1737921b1e3bdb3370ba3b6c98df80a0c4d (patch) | |
| tree | 7d8aa627a1746299166cca326d3c4799e3f5bf05 /lib/MGA | |
| parent | c3802a7f2b424abfb77c88104357877bf43ab2c6 (diff) | |
| download | drakiso-56dba1737921b1e3bdb3370ba3b6c98df80a0c4d.tar drakiso-56dba1737921b1e3bdb3370ba3b6c98df80a0c4d.tar.gz drakiso-56dba1737921b1e3bdb3370ba3b6c98df80a0c4d.tar.bz2 drakiso-56dba1737921b1e3bdb3370ba3b6c98df80a0c4d.tar.xz drakiso-56dba1737921b1e3bdb3370ba3b6c98df80a0c4d.zip | |
Add error message before we die due to unresolved conflicts.
Diffstat (limited to 'lib/MGA')
| -rwxr-xr-x | lib/MGA/DrakISO/BuildClassic.pm | 2 |
1 files changed, 1 insertions, 1 deletions
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"; } |