From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 17 Dec 2015 13:16:08 +0000 (+0000)
Subject: db_retry: Suppress an "exiting via last" warning
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=53d788f1545ac9158e91d0818c86a6282e7e3424;p=people%2Fliuw%2Fosstest.git

db_retry: Suppress an "exiting via last" warning

This warning appears when db_retry_abort is used, since 2b069b6c
"Database locking: Perl: Retry all deadlocks in PostgreSQL".

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/Osstest.pm b/Osstest.pm
index 6591e1a..9ff86ab 100644
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -299,6 +299,7 @@ sub db_retry ($$$;$$) {
 	    $r= &$body;
 	    if ($db_retry_stop) {
 		$dbh->rollback();
+		no warnings qw(exiting);
 		last if $db_retry_stop eq 'abort';
 		next;
 	    }