]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
db_retry: Suppress an "exiting via last" warning
authorIan Jackson <ian.jackson@eu.citrix.com>
Thu, 17 Dec 2015 13:16:08 +0000 (13:16 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Tue, 5 Jan 2016 17:46:12 +0000 (17:46 +0000)
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>
Osstest.pm

index 6591e1a253602337f21d2be6aa0f68ee70e1d278..9ff86ab2650a716c5087dd5c6c6469b428cd5262 100644 (file)
@@ -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;
            }