From f850effe0baef8a37ad2eef3ef581b79539cc304 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 14 May 2016 03:02:42 +0000 Subject: rename most instances of "list" to "inbox" A public-inbox is NOT necessarily a mailing list, but it could serve as an input point for zero, one, or infinite mailing lists :D --- script/public-inbox-init | 4 ++-- script/public-inbox-learn | 2 +- script/public-inbox-mda | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'script') diff --git a/script/public-inbox-init b/script/public-inbox-init index d66361df..ca0f9ddf 100755 --- a/script/public-inbox-init +++ b/script/public-inbox-init @@ -43,10 +43,10 @@ if (-e $pi_config) { foreach my $addr (@address) { my $found = $cfg->lookup($addr); if ($found) { - if ($found->{listname} ne $name) { + if ($found->{inbox} ne $name) { print STDERR "`$addr' already defined for ", - "`$found->{listname}',\n", + "`$found->{inbox}',\n", "does not match intend `$name'\n"; $conflict = 1; } else { diff --git a/script/public-inbox-learn b/script/public-inbox-learn index 0af1e94c..1c051ec1 100755 --- a/script/public-inbox-learn +++ b/script/public-inbox-learn @@ -51,7 +51,7 @@ foreach my $recipient (keys %dests) { my $git = PublicInbox::Git->new($git_dir); # We do not touch GIT_COMMITTER_* env here so we can track # who trained the message. - my $name = $ENV{GIT_COMMITTER_NAME} || $dst->{listname}; + my $name = $ENV{GIT_COMMITTER_NAME} || $dst->{inbox}; my $email = $ENV{GIT_COMMITTER_EMAIL} || $recipient; my $im = PublicInbox::Import->new($git, $name, $email); diff --git a/script/public-inbox-mda b/script/public-inbox-mda index 611e7c38..8e224a50 100755 --- a/script/public-inbox-mda +++ b/script/public-inbox-mda @@ -49,7 +49,7 @@ if (PublicInbox::MDA->precheck($filter, $dst->{address}) && } elsif ($fcfg eq 'scrub') { $filter_arg = undef; # the default for legacy versions } else { - warn "publicinbox.$dst->{listname}.filter=$fcfg invalid\n"; + warn "publicinbox.$dst->{inbox}.filter=$fcfg invalid\n"; warn "must be either 'scrub' or 'reject' (the default)\n"; } @@ -65,7 +65,7 @@ if (PublicInbox::MDA->precheck($filter, $dst->{address}) && }; my $git = PublicInbox::Git->new($main_repo); my $im = PublicInbox::Import->new($git, - $dst->{listname}, $recipient); + $dst->{inbox}, $recipient); if (defined $im->add($msg)) { $im->done; $filter->ignore; # exits -- cgit v1.2.3-24-ge0c7