treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / WatchMaildir.pm

diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index e923178066fcac20f7e4e5a6c331354ee7d5a7da..e2024640c5e6182767afc45df9b2653952f04132 100644 (file)
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # ref: https://cr.yp.to/proto/maildir.html
@@ -7,12 +7,10 @@ package PublicInbox::WatchMaildir;
 use strict;
 use warnings;
 use PublicInbox::MIME;
-use PublicInbox::Spawn qw(spawn);
 use PublicInbox::InboxWritable;
-use File::Temp qw//;
-use PublicInbox::Filter::Base;
+use File::Temp 0.19 (); # 0.19 for ->newdir
+use PublicInbox::Filter::Base qw(REJECT);
 use PublicInbox::Spamcheck;
-*REJECT = *PublicInbox::Filter::Base::REJECT;
 *maildir_path_load = *PublicInbox::InboxWritable::maildir_path_load;
 
 sub new {
@@ -204,7 +202,8 @@ sub watch {
 
        # lazy load here, we may support watching via IMAP IDLE
        # in the future...
-       require Filesys::Notify::Simple;
+       eval { require Filesys::Notify::Simple } or
+               die "Filesys::Notify::Simple is currently required for $0\n";
        my $fsn = Filesys::Notify::Simple->new([@{$self->{mdir}}, $scandir]);
        $fsn->wait($cb) until $self->{quit};
 }