RH-FMK / skt / 1255

66%

master: 66%

Pull #344

travis-ci

Don't catch exceptions when aborting patch application

If `git am --abort` goes wrong, something is seriously wrong and we
shouldn't continue as if it wasn't. Instead of catching the exception,
let skt abort when it happens.

Doing so allows to distinguish between a merge failure and error, which
means the (possibly serious) issue won't go unnoticed. The original
patch application failure is also logged before aborting so the issue
can be reproduced.

Only continue the normal flow of reporting the patch application failure
if the cleanup went fine - we have no idea why `git am --abort` went
wrong, and it could be caused by a previously messed up repository, in
which case the application error is not caused by the patch itself, and
the problem should *not* be reported to its author.

Fixes #229

Signed-off-by: Veronika Kabatova <vkabatov@redhat.com>

309 of 525 branches covered (58.86%)

Branch coverage included in aggregate %.

4 of 4 new or added lines in 1 file covered. (100.0%)

991 of 1433 relevant lines covered (69.16%)

0.69 hits per line