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;
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 ($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;
}
$epoch = $nr;
} else {
warn "W: $edir missing remote.origin.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;
use PublicInbox::TestCommon;
use File::Path qw(remove_tree make_path);
use Cwd qw(abs_path);
+use Carp ();
use PublicInbox::Spawn qw(which);
require_git(2.6);
require_cmd('curl');
my $fetch_each_epoch = sub {
my %before = map { $_ => 1 } glob("$tmpdir/m/git/*");
run_script([qw(-fetch --exit-code -q)], undef, {-C => "$tmpdir/m"}) or
- xbail '-fetch fail';
+ xbail('-fetch fail ',
+ [ xqx([which('find'), "$tmpdir/m", qw(-type f -ls) ]) ],
+ Carp::longmess());
is($?, 0, '--exit-code 0 after fetch updated');
my @after = grep { !$before{$_} } glob("$tmpdir/m/git/*");
push @new_epochs, @after;
my @g = glob("$dst/git/*.git");
my @w = grep { -w $_ } @g;
my @r = grep { ! -w $_ } @g;
+ if ($> == 0) {
+ @w = grep { (stat($_))[2] & 0200 } @g;
+ @r = grep { !((stat($_))[2] & 0200) } @g;
+ }
is(scalar(@w), 1, 'one writable directory');
my ($w) = ($w[0] =~ m!/([0-9]+)\.git\z!);
is((grep {
"http://$host:$port/v2/", $dst]);
my @g2 = glob("$dst/git/*.git") ;
is_deeply(\@g2, \@g, 'cloned again');
- is(scalar(grep { -w $_ } @g2), scalar(@w) + 1,
+ is(scalar(grep { (stat($_))[2] & 0200 } @g2), scalar(@w) + 1,
'got one more cloned epoch');
# make 0.git writable and fetch into it, relies on culled manifest
@cmd = (qw(-clone -q --epoch=~0), "http://$host:$port/v2", $dst);
run_script(\@cmd, undef, { 2 => \($err = '') });
is($?, 0, 'partial scraping clone on old PublicInbox::WWW');
- my @g_last = grep { -w $_ } glob("$dst/git/*.git");
+ my @g_last = grep { (stat($_))[2] & 0200 } glob("$dst/git/*.git");
is_deeply(\@g_last, [ $g_all[-1] ], 'partial clone of ~0 worked');
chmod(0755, $g_all[0]) or xbail "chmod $!";