From ab2b0607f05904866784684603c4a1f5c13c1e80 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 10 Jan 2020 08:49:32 +0000 Subject: [PATCH] make Filesys::Notify::Simple optional It's only used by us in public-inbox-watch, and maybe not for long. It's in most installations because Plack pulls it in though, but Plack is no longer required. --- Makefile.PL | 2 +- ci/deps.perl | 5 ++--- lib/PublicInbox/WatchMaildir.pm | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index 6b20385a..94ec16c6 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -132,7 +132,7 @@ WriteMakefile( # Filesys::Notify::Simple is pulled in by Plack, but also # needed by public-inbox-watch (for now) - 'Filesys::Notify::Simple' => 0, + # 'Filesys::Notify::Simple' => 0, # TODO: this should really be made optional... 'URI::Escape' => 0, diff --git a/ci/deps.perl b/ci/deps.perl index 08722e1c..93cc5d25 100755 --- a/ci/deps.perl +++ b/ci/deps.perl @@ -14,8 +14,7 @@ my @test_essential = qw(Test::Simple); # we actually use Test::More # package profiles my $profiles = { # the smallest possible profile for testing - # TODO: trim this, Plack pulls in Filesys::Notify::Simple, - # and we don't need that for mda-only installs + # TODO: trim URI::Escape from this, maybe essential => [ qw( git perl @@ -26,7 +25,6 @@ my $profiles = { Email::MIME::ContentType Encode ExtUtils::MakeMaker - Filesys::Notify::Simple URI::Escape ), @test_essential ], @@ -36,6 +34,7 @@ my $profiles = { BSD::Resource DBD::SQLite DBI + Filesys::Notify::Simple IO::Compress::Gzip Inline::C Net::Server diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm index dfb987e8..cf1dfa76 100644 --- a/lib/PublicInbox/WatchMaildir.pm +++ b/lib/PublicInbox/WatchMaildir.pm @@ -202,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}; } -- 2.44.0