From: cjwatson <>
Date: Mon, 18 Jul 2005 01:04:01 +0000 (-0800)
Subject: [project @ 2005-07-17 18:04:01 by cjwatson]
X-Git-Tag: release/2.6.0~713
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=212be3afc9cd3364c872468c00795fc5884281b8;p=debbugs.git

[project @ 2005-07-17 18:04:01 by cjwatson]
fix lockreadbugmerge; readbug returns a hashref, not a hash
---

diff --git a/scripts/errorlib.in b/scripts/errorlib.in
index a8faf3d0..0afa8a3f 100755
--- a/scripts/errorlib.in
+++ b/scripts/errorlib.in
@@ -1,5 +1,5 @@
 # -*- perl -*-
-# $Id: errorlib.in,v 1.43 2005/07/17 16:06:26 cjwatson Exp $
+# $Id: errorlib.in,v 1.44 2005/07/17 18:04:01 cjwatson Exp $
 
 use Mail::Address;
 use Debbugs::MIME qw(decode_rfc1522 encode_rfc1522);
@@ -22,7 +22,7 @@ sub lockreadbugmerge {
     local ($lref, $location) = @_;
     local $data;
     if (!($data = &lockreadbug($lref, $location))) { return ( 0, undef ); }
-    if (!length($data{mergedwith})) { return ( 1, $data ); }
+    if (!length($data->{mergedwith})) { return ( 1, $data ); }
     &unfilelock;
     &filelock('lock/merge');
     if (!&lockreadbug($lref, $location)) { &unfilelock; return ( 0, undef ); }