[OSSTEST PATCH 7/9] Executive DB retry: Avoid an undefined warning

From: Ian Jackson <ian.jackson@eu.citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>,
	Ian Campbell <ian.campbell@citrix.com>
Subject: [OSSTEST PATCH 7/9] Executive DB retry: Avoid an undefined warning
Date: Thu, 17 Dec 2015 17:06:06 +0000	[thread overview]
Message-ID: <1450371968-27997-7-git-send-email-ian.jackson@eu.citrix.com> (raw)
In-Reply-To: <1450371968-27997-1-git-send-email-ian.jackson@eu.citrix.com>

If something other than the DB statements inside need_retry throws an
exception, ->err will normally be undef (because
$dbh_tests->begin_work will clear it, if nothing else).

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 Osstest/JobDB/Executive.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm
index 6fb77a4..c0af21c 100644
--- a/Osstest/JobDB/Executive.pm
+++ b/Osstest/JobDB/Executive.pm
@@ -50,7 +50,7 @@ sub begin_work ($$$) { #method
 sub need_retry ($$$) {
     my ($jd, $dbh,$committing) = @_;
     return
-	$dbh_tests->err()==7 &&
+	($dbh_tests->err() // 0)==7 &&
 	($dbh_tests->state =~ m/^40P01/); # DEADLOCK DETECTED
 }
 
-- 
1.7.10.4
