We must support multi-address mailing lists, so we do not
clobber existing addresses. However, we need to ensure
idempotency and ensure existing addresses are not reset.
Furthermore, we were not parsing the existing config correctly
due to a leaking $/.
my $http_url = shift @ARGV or usage();
my (@address) = @ARGV;
@address or usage();
my $http_url = shift @ARGV or usage();
my (@address) = @ARGV;
@address or usage();
my $pi_config = PublicInbox::Config->default_file;
my $dir = dirname($pi_config);
my $pi_config = PublicInbox::Config->default_file;
my $dir = dirname($pi_config);
my ($fh, $filename) = tempfile('pi-init-XXXXXXXX', DIR => $dir);
if (-e $pi_config) {
open(my $oh, '<', $pi_config) or die "unable to read $pi_config: $!\n";
my ($fh, $filename) = tempfile('pi-init-XXXXXXXX', DIR => $dir);
if (-e $pi_config) {
open(my $oh, '<', $pi_config) or die "unable to read $pi_config: $!\n";
- local $/;
- my $old = <$oh>;
+ my $old;
+ {
+ local $/;
+ $old = <$oh>;
+ }
print $fh $old or die "failed to write: $!\n";
close $oh or die "failed to close $pi_config: $!\n";
print $fh $old or die "failed to write: $!\n";
close $oh or die "failed to close $pi_config: $!\n";
my $conflict;
foreach my $addr (@address) {
my $found = $cfg->lookup($addr);
my $conflict;
foreach my $addr (@address) {
my $found = $cfg->lookup($addr);
- if ($found && ($found->{listname} ne $name)) {
- print STDERR
- "`$addr' already defined for ",
- "`$found->{listname}',\n",
- "does not match intend `$name'\n";
- $conflict = 1;
+ if ($found) {
+ if ($found->{listname} ne $name) {
+ print STDERR
+ "`$addr' already defined for ",
+ "`$found->{listname}',\n",
+ "does not match intend `$name'\n";
+ $conflict = 1;
+ } else {
+ $seen{lc($addr)} = 1;
+ }
$git_dir = expand_filename($git_dir);
x(qw(git init -q --bare), $git_dir);
foreach my $addr (@address) {
$git_dir = expand_filename($git_dir);
x(qw(git init -q --bare), $git_dir);
foreach my $addr (@address) {
- x(@x, "$pfx.address", $addr);
+ next if $seen{lc($addr)};
+ x(@x, "--add", "$pfx.address", $addr);
}
x(@x, "$pfx.url", $http_url);
x(@x, "$pfx.mainrepo", $git_dir);
}
x(@x, "$pfx.url", $http_url);
x(@x, "$pfx.mainrepo", $git_dir);