From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 6 May 2007 07:04:43 +0000 (-0700)
Subject:   - Make file locking portable (closes: #293277)
X-Git-Tag: release/2.6.0~565^2~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;ds=sidebyside;h=9fd07325a5381276891e4b14d47fea8b3a4cf13f;p=debbugs.git

  - Make file locking portable (closes: #293277)
---

diff --git a/cgi/bugreport.cgi b/cgi/bugreport.cgi
index c04854b..4987816 100755
--- a/cgi/bugreport.cgi
+++ b/cgi/bugreport.cgi
@@ -125,7 +125,7 @@ sub display_entity ($$$$\$\@) {
 	$$this .= '<pre class="mime">[<a href="' . bug_url(@dlargs) . qq{">$printname</a> } .
 		  "($type, $disposition)]</pre>\n";
 
-	if ($msg and defined($att) and $att eq $#$attachments) {
+	if ($msg and defined($att) and $att == $#$attachments) {
 	    my $head = $entity->head;
 	    chomp(my $type = $entity->effective_type);
 	    my $body = $entity->stringify_body;
diff --git a/debian/changelog b/debian/changelog
index ad29843..80b1ce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -167,6 +167,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
     - lc submitter address for comparsion in pkgreport.cgi
       (closes: #415628)
     - Add quotes around retitle'd titles (closes: #419202)
+    - Make file locking portable (closes: #293277)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
diff --git a/debian/control b/debian/control
index 20d9c01..e8591a7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debbugs
 Section: misc
 Priority: extra
 Maintainer: Debbugs developers <debian-debbugs@lists.debian.org>
-Uploaders: Josip Rodin <joy-packages@debian.org>, Colin Watson <cjwatson@debian.org>
+Uploaders: Josip Rodin <joy-packages@debian.org>, Colin Watson <cjwatson@debian.org>, Don Armstrong <don@debian.org>
 Standards-Version: 3.2.1
 Build-Depends-Indep: debhelper, libparams-validate-perl, libmailtools-perl, libmime-perl, libio-stringy-perl, libmldbm-perl, liburi-perl, libsoap-lite-perl, libcgi-simple-perl, libhttp-server-simple-perl, libtest-www-mechanize-perl