use v5.10.1;
use parent qw(PublicInbox::IPC);
use URI ();
-use PublicInbox::Spawn qw(popen_rd run_die);
+use PublicInbox::Spawn qw(popen_rd run_die spawn);
use PublicInbox::Admin;
use PublicInbox::LEI;
use PublicInbox::LeiCurl;
}
sub remote_url ($$) {
- my ($lei, $dir) = @_; # TODO: support non-"origin"?
- my $cmd = [ qw(git config remote.origin.url) ];
- my $fh = popen_rd($cmd, undef, { -C => $dir, 2 => $lei->{2} });
- my $url = <$fh>;
- close $fh or return;
- $url =~ s!/*\n!!s;
- $url;
+ my ($lei, $dir) = @_;
+ my $rn = $lei->{opt}->{'try-remote'} // [ 'origin', '_grokmirror' ];
+ for my $r (@$rn) {
+ my $cmd = [ qw(git config), "remote.$r.url" ];
+ my $fh = popen_rd($cmd, undef, { -C => $dir, 2 => $lei->{2} });
+ my $url = <$fh>;
+ close $fh or next;
+ $url =~ s!/*\n!!s;
+ return $url;
+ }
+ undef
}
sub do_manifest ($$$) {
$m0 = eval {
PublicInbox::LeiMirror::decode_manifest($fh, $mf, $mf)
};
- $lei->err($@) if $@;
+ warn($@) if $@;
}
my ($bn) = ($fn =~ m!/([^/]+)\z!);
my $curl_cmd = $lei->{curl}->for_uri($lei, $muri, qw(-R -o), $bn);
Digest::SHA::sha256(do { local $/; <$rd> });
}
+sub writable_dir ($) {
+ my ($dir) = @_;
+ return unless -d $dir && -w _;
+ my @st = stat($dir);
+ $st[2] & 0222; # any writable bits set? (in case of root)
+}
+
sub do_fetch { # main entry point
my ($cls, $lei, $cd) = @_;
my $ibx_ver;
my ($ibx_uri, @git_dir, @epochs, $mg, @new_epoch, $skip);
if ($ibx_ver == 1) {
my $url = remote_url($lei, $dir) //
- die "E: $dir missing remote.origin.url\n";
+ die "E: $dir missing remote.*.url\n";
$ibx_uri = URI->new($url);
} else { # v2:
require PublicInbox::MultiGit;
my ($git_url, $epoch);
for my $nr (@epochs) { # try newest epoch, first
my $edir = "$dir/git/$nr.git";
- unless (-d $edir && -w _) { # must be writable dir
+ if (!writable_dir($edir)) {
$skip->{$nr} = 1;
next;
}
$git_url = $url;
$epoch = $nr;
} else {
- warn "W: $edir missing remote.origin.url\n";
+ warn "W: $edir missing remote.*.url\n";
+ my $pid = spawn([qw(git config -l)], undef,
+ { 1 => $lei->{2}, 2 => $lei->{2} });
+ waitpid($pid, 0);
+ $lei->child_error($?) if $?;
}
}
@epochs = grep { !$skip->{$_} } @epochs if $skip;
}
for my $i (@new_epoch) { $mg->epoch_cfg_set($i) }
if ($ft) {
- my $fn = $ft->filename;
if ($mculled) {
my $json = PublicInbox::Config->json->encode($m1);
+ my $fn = $ft->filename;
gzip(\$json => $fn) or die "gzip: $GzipError";
}
- rename($fn, $mf) or die "E: rename($fn, $mf): $!\n";
- $ft->unlink_on_destroy(0);
+ PublicInbox::LeiMirror::ft_rename($ft, $mf, 0666);
}
$lei->child_error($xit << 8) if $fp2 && $xit;
}