X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiMirror.pm;h=44d7a5240781fb338f9b1c7c733cf5b461f47957;hb=3164ce21aeb7c6ca10638d1c1d14e6f58d5b9180;hp=f81f609469bcf788b474248ce70b9936d3055fca;hpb=eb397a9f3871a5bc64f5f8a36dc61a7e16e74541;p=public-inbox.git

diff --git a/lib/PublicInbox/LeiMirror.pm b/lib/PublicInbox/LeiMirror.pm
index f81f6094..44d7a524 100644
--- a/lib/PublicInbox/LeiMirror.pm
+++ b/lib/PublicInbox/LeiMirror.pm
@@ -259,7 +259,8 @@ sub clone_v1 {
 		push @$cmd, '--reference', "$self->{dst}$ref";
 	start_clone($self, $cmd, $opt, $fini);
 
-	_get_txt_start($self, '_/text/config/raw', $fini);
+	$lei->{opt}->{'inbox-config'} =~ /\A(?:always|v1)\z/s and
+		_get_txt_start($self, '_/text/config/raw', $fini);
 	my $d = $self->{-ent} ? $self->{-ent}->{description} : undef;
 	defined($d) ? ($self->{'txt.description'} = $d) :
 		_get_txt_start($self, 'description', $fini);
@@ -445,7 +446,9 @@ failed to extract epoch number from $src
 	my $lk = bless { lock_path => "$dst/inbox.lock" }, 'PublicInbox::Lock';
 	my $fini = PublicInbox::OnDestroy->new($$, \&v2_done, $task);
 
-	_get_txt_start($task, '_/text/config/raw', $fini);
+	$lei->{opt}->{'inbox-config'} =~ /\A(?:always|v2)\z/s and
+		_get_txt_start($task, '_/text/config/raw', $fini);
+
 	_get_txt_start($self, 'description', $fini);
 
 	$task->{-locked} = $lk->lock_for_scope($$) if !$self->{dry_run};
@@ -649,11 +652,15 @@ sub start_clone_url {
 	die "TODO: non-HTTP/HTTPS clone of $self->{src} not supported, yet";
 }
 
-sub do_mirror { # via wq_io_do
+sub do_mirror { # via wq_io_do or public-inbox-clone
 	my ($self) = @_;
 	my $lei = $self->{lei};
 	umask($lei->{client_umask}) if defined $lei->{client_umask};
 	eval {
+		my $ic = $lei->{opt}->{'inbox-config'} //= 'always';
+		$ic =~ /\A(?:v1|v2|always|never)\z/s or die <<"";
+--inbox-config must be one of `always', `v2', `v1', or `never'
+
 		my $iv = $lei->{opt}->{'inbox-version'};
 		if (defined $iv) {
 			local $LIVE;