From e01fc7d6c08ffaaf14406802f4085dc41f24f7e5 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 20 Apr 2020 09:33:38 +0000 Subject: [PATCH] drop needless `eval {}' around Config->new It hasn't been needed since commit 089cca37fa036411 ("config: ignore missing config files"). And we actually want to propagate errors when we can't start new processes or if git(1) is missing. --- lib/PublicInbox/Admin.pm | 2 +- script/public-inbox-convert | 2 +- script/public-inbox-edit | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm index 336b7d4c..60f4f40d 100644 --- a/lib/PublicInbox/Admin.pm +++ b/lib/PublicInbox/Admin.pm @@ -71,7 +71,7 @@ sub resolve_inboxes ($;$$) { my ($argv, $opt, $cfg) = @_; $opt ||= {}; - $cfg //= eval { PublicInbox::Config->new }; + $cfg //= PublicInbox::Config->new; if ($opt->{all}) { my $cfgfile = PublicInbox::Config::default_file(); $cfg or die "--all specified, but $cfgfile not readable\n"; diff --git a/script/public-inbox-convert b/script/public-inbox-convert index e13c13f4..4c220b36 100755 --- a/script/public-inbox-convert +++ b/script/public-inbox-convert @@ -24,7 +24,7 @@ my $old_dir = shift(@ARGV) or die $usage; my $new_dir = shift(@ARGV) or die $usage; die "$new_dir exists\n" if -d $new_dir; die "$old_dir not a directory\n" unless -d $old_dir; -my $config = eval { PublicInbox::Config->new }; +my $config = PublicInbox::Config->new; $old_dir = abs_path($old_dir); my $old; if ($config) { diff --git a/script/public-inbox-edit b/script/public-inbox-edit index 28b1b5e8..42f914a8 100755 --- a/script/public-inbox-edit +++ b/script/public-inbox-edit @@ -22,7 +22,7 @@ my @opt = qw(mid|m=s file|F=s raw); GetOptions($opt, @PublicInbox::AdminEdit::OPT, @opt) or die "bad command-line args\n$usage\n"; -my $cfg = eval { PublicInbox::Config->new }; +my $cfg = PublicInbox::Config->new; my $editor = $ENV{MAIL_EDITOR}; # e.g. "mutt -f" unless (defined $editor) { my $k = 'publicinbox.mailEditor'; -- 2.44.0