Merge branch 'master' into debiandebian/0.2-1

1 files changed, 2 insertions, 1 deletions

diff --git a/interimap b/interimap
index 54ae0aa..401bfa2 100755
--- a/interimap
+++ b/interimap
@@ -130,6 +130,7 @@ $SIG{TERM} = sub { cleanup(); exit 0; };
         close $lock;
         chomp $pid;
         my $msg = "LOCKFILE '$LOCKFILE' exists.";
+        undef $LOCKFILE; # don't delete the lockfile
         $msg .= " (Is PID $pid running?)" if defined $pid and $pid =~ /^[0-9]+$/;
         die $msg, "\n";
     }
@@ -276,7 +277,7 @@ foreach my $name (qw/local remote/) {
 #
 
 # Add a new mailbox to the database.
-my $STH_INSERT_MAILBOX= $DBH->prepare(q{INSERT INTO mailboxes (mailbox,subscribed) VALUES (?,?)});
+my $STH_INSERT_MAILBOX = $DBH->prepare(q{INSERT INTO mailboxes (mailbox,subscribed) VALUES (?,?)});
 
 # Get the index associated with a mailbox.
 my $STH_GET_INDEX = $DBH->prepare(q{SELECT idx,subscribed FROM mailboxes WHERE mailbox = ?});