From 96d68fd998db06cca222a0aa2f02f553741d1df1 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 19 Feb 2021 05:09:50 -0700 Subject: [PATCH] t/lei-externals: favor "-o format:$PATHNAME" over "-f" It'll be less ambiguous for inputs with "lei convert" and "lei import" cf. https://public-inbox.org/meta/20210217044032.GA17934@dcvr/ --- lib/PublicInbox/LeiToMail.pm | 2 +- t/lei-externals.t | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm index 8a2d9471..b90756ae 100644 --- a/lib/PublicInbox/LeiToMail.pm +++ b/lib/PublicInbox/LeiToMail.pm @@ -358,7 +358,7 @@ sub new { require PublicInbox::MboxReader if $lei->{opt}->{augment}; (-d $dst || (-e _ && !-w _)) and die "$dst exists and is not a writable file\n"; - $self->can("eml2$fmt") or die "bad mbox --format=$fmt\n"; + $self->can("eml2$fmt") or die "bad mbox format: $fmt\n"; $self->{base_type} = 'mbox'; } else { die "bad mail --format=$fmt\n"; diff --git a/t/lei-externals.t b/t/lei-externals.t index f61b7e52..edfbb2bf 100644 --- a/t/lei-externals.t +++ b/t/lei-externals.t @@ -117,18 +117,18 @@ test_lei(sub { unlike($lei_out, qr!https://example\.com/ibx/!s, 'removed canonical URL'); SKIP: { - ok(!$lei->(qw(q s:prefix -o /dev/null -f maildir)), 'bad maildir'); + ok(!lei(qw(q s:prefix -o maildir:/dev/null)), 'bad maildir'); like($lei_err, qr!/dev/null exists and is not a directory!, 'error shown'); is($? >> 8, 1, 'errored out with exit 1'); - ok(!$lei->(qw(q s:prefix -f mboxcl2 -o), $home), 'bad mbox'); + ok(!lei(qw(q s:prefix -o), "mboxcl2:$home"), 'bad mbox'); like($lei_err, qr!\Q$home\E exists and is not a writable file!, 'error shown'); is($? >> 8, 1, 'errored out with exit 1'); - ok(!$lei->(qw(q s:prefix -o /dev/stdout -f Mbox2)), 'bad format'); - like($lei_err, qr/bad mbox --format=mbox2/, 'error shown'); + ok(!lei(qw(q s:prefix -o Mbox2:/dev/stdout)), 'bad format'); + like($lei_err, qr/bad mbox format: mbox2/, 'error shown'); is($? >> 8, 1, 'errored out with exit 1'); # note, on a Bourne shell users should be able to use either: -- 2.44.0