From 488f600ff3a5f38386d8eb5c686023fa5fb3a098 Mon Sep 17 00:00:00 2001
From: Michael Pyne <mpyne@kde.org>
Date: Thu, 13 Feb 2014 18:09:20 -0500
Subject: [PATCH] Use newly-added had_an_exception function where it seems
 appropriate.

---
 kdesrc-build                         | 4 ++--
 modules/ksb/Module.pm                | 2 +-
 modules/ksb/ModuleSet/KDEProjects.pm | 2 +-
 modules/ksb/Updater/Svn.pm           | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kdesrc-build b/kdesrc-build
index 893d9b3..353ad82 100755
--- a/kdesrc-build
+++ b/kdesrc-build
@@ -237,8 +237,8 @@ eval
 
 if (my $err = $@)
 {
-    if (ref $err && $err->isa('ksb::BuildException')) {
-        print $err->{'exception_type'}, " error: ", $err->{'message'}, "\n";
+    if (had_an_exception()) {
+        print "kdesrc-build encountered an exceptional error condition: $err\n";
         print "\tCan't continue, so stopping now.\n";
 
         if ($err->{'exception_type'} eq 'Internal') {
diff --git a/modules/ksb/Module.pm b/modules/ksb/Module.pm
index 45b1ab5..8ec0bbc 100644
--- a/modules/ksb/Module.pm
+++ b/modules/ksb/Module.pm
@@ -757,7 +757,7 @@ sub update
     {
         my $reason = ksb::IPC::MODULE_FAILURE;
 
-        if (ref $@ && $@->isa('ksb::BuildException')) {
+        if (had_an_exception()) {
             if ($@->{'exception_type'} eq 'ConflictPresent') {
                 $reason = ksb::IPC::MODULE_CONFLICT;
             }
diff --git a/modules/ksb/ModuleSet/KDEProjects.pm b/modules/ksb/ModuleSet/KDEProjects.pm
index 30b3b61..95d8439 100644
--- a/modules/ksb/ModuleSet/KDEProjects.pm
+++ b/modules/ksb/ModuleSet/KDEProjects.pm
@@ -211,7 +211,7 @@ sub convertToModules
         };
 
         if ($@) {
-            die $@ if ref $@; # Forward exception objects up
+            die $@ if had_an_exception(); # Forward exception objects up
             croak_runtime("The XML for the KDE Project database could not be understood: $@");
         }
 
diff --git a/modules/ksb/Updater/Svn.pm b/modules/ksb/Updater/Svn.pm
index 1b6d226..281b112 100644
--- a/modules/ksb/Updater/Svn.pm
+++ b/modules/ksb/Updater/Svn.pm
@@ -426,7 +426,7 @@ sub update_module_path
     my $count = eval { $self->run_svn('svn-up', \@args); };
 
     # Update failed, try svn cleanup.
-    if ($@ && $@->{exception_type} ne 'ConflictPresent')
+    if (had_an_exception() && $@->{exception_type} ne 'ConflictPresent')
     {
         info ("\tUpdate failed, trying a cleanup.");
         my $result = safe_system('svn', 'cleanup');