gcf2: die if pkg-config is missing

[public-inbox.git] / lib / PublicInbox / Gcf2.pm

diff --git a/lib/PublicInbox/Gcf2.pm b/lib/PublicInbox/Gcf2.pm
index 01b83c96f684f06f85b6a292ac85eb60726f34a3..0f9675797ffd937eea27927c90c735179a766318 100644 (file)
--- a/lib/PublicInbox/Gcf2.pm
+++ b/lib/PublicInbox/Gcf2.pm
@@ -5,7 +5,8 @@
 # other libgit2 stuff may go here, too.
 package PublicInbox::Gcf2;
 use strict;
-use PublicInbox::Spawn qw(which popen_rd);
+use v5.10.1;
+use PublicInbox::Spawn qw(which popen_rd); # may set PERL_INLINE_DIRECTORY
 use Fcntl qw(LOCK_EX);
 use IO::Handle; # autoflush
 my (%CFG, $c_src, $lockfh);
@@ -16,7 +17,8 @@ BEGIN {
                die 'PERL_INLINE_DIRECTORY not defined';
        my $f = "$inline_dir/.public-inbox.lock";
        open $lockfh, '>', $f or die "failed to open $f: $!\n";
-       my $pc = which($ENV{PKG_CONFIG} // 'pkg-config');
+       my $pc = which($ENV{PKG_CONFIG} // 'pkg-config') //
+               die "pkg-config missing for libgit2";
        my ($dir) = (__FILE__ =~ m!\A(.+?)/[^/]+\z!);
        my $rdr = {};
        open $rdr->{2}, '>', '/dev/null' or die "open /dev/null: $!";
@@ -73,6 +75,7 @@ sub add_alt ($$) {
                $gcf2->add_alternate($_) for @abs_alt;
        }
        $gcf2->add_alternate($objdir);
+       1;
 }
 
 # Usage: $^X -MPublicInbox::Gcf2 -e PublicInbox::Gcf2::loop
@@ -86,7 +89,7 @@ sub loop () {
        while (<STDIN>) {
                chomp;
                my ($oid, $git_dir) = split(/ /, $_, 2);
-               $seen{$git_dir}++ or add_alt($gcf2, "$git_dir/objects");
+               $seen{$git_dir} //= add_alt($gcf2, "$git_dir/objects");
                if (!$gcf2->cat_oid(1, $oid)) {
                        # retry once if missing.  We only get unabbreviated OIDs
                        # from SQLite or Xapian DBs, here, so malicious clients
@@ -94,8 +97,7 @@ sub loop () {
                        warn "I: $$ $oid missing, retrying in $git_dir\n";
 
                        $gcf2 = new();
-                       %seen = ($git_dir => 1);
-                       add_alt($gcf2, "$git_dir/objects");
+                       %seen = ($git_dir => add_alt($gcf2,"$git_dir/objects"));
 
                        if ($gcf2->cat_oid(1, $oid)) {
                                warn "I: $$ $oid found after retry\n";