From 53ffc92a0a76c7fd0ed689ec281826b52ed6b7cd Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Wed, 8 Aug 2007 02:48:09 +0000
Subject: Bug 391073: process_bug.cgi throws an error if a bug is moved to
 another product or component where a given flag doesn't apply as is - Patch
 by Frédéric Buclin <LpSolit@gmail.com> r/a=mkanat
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bugzilla/Error.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm
index d9f6e70b3..d5b8a3479 100644
--- a/Bugzilla/Error.pm
+++ b/Bugzilla/Error.pm
@@ -41,7 +41,9 @@ sub _throw_error {
 
     # Make sure any locked tables are unlocked
     # and the transaction is rolled back (if supported)
-    Bugzilla->dbh->bz_unlock_tables(UNLOCK_ABORT);
+    # If we are within an eval(), do not unlock tables as we are
+    # eval'uating some test on purpose.
+    Bugzilla->dbh->bz_unlock_tables(UNLOCK_ABORT) unless $^S;
 
     my $datadir = bz_locations()->{'datadir'};
     # If a writable $datadir/errorlog exists, log error details there.
-- 
cgit v1.2.3-24-g4f1b