From: lpsolit%gmail.com <>
Date: Wed, 8 Aug 2007 02:49:34 +0000 (+0000)
Subject: Bug 391073: process_bug.cgi throws an error if a bug is moved to another product... 
X-Git-Tag: bugzilla-3.0.1~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=222a0d2f2262125ce6b8e1c03a1eb720528f8d0b;p=thirdparty%2Fbugzilla.git

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
---

diff --git a/Bugzilla/Error.pm b/Bugzilla/Error.pm
index d9f6e70b3d..d5b8a34792 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.