diff options
author | Eric Wong <e@80x24.org> | 2022-12-31 06:17:20 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2023-01-01 10:47:13 +0000 |
commit | e6923c94de9d302fdc51185a7bea516b28b35fc1 (patch) | |
tree | 24147791e9ba7c1f4dcc7a96ed44faccdff198d3 /lib/PublicInbox | |
parent | 68e182a29404407680bee482f99ee24dd9c3c7cb (diff) | |
download | public-inbox-e6923c94de9d302fdc51185a7bea516b28b35fc1.tar.gz |
Loading cgitrc (and associated projects.list) can get users out of defining as many individual coderepos. xt/solver.t needs a use of `$_' replaced since that gets clobbered while parsing cgitrc.
Diffstat (limited to 'lib/PublicInbox')
-rw-r--r-- | lib/PublicInbox/Config.pm | 3 | ||||
-rw-r--r-- | lib/PublicInbox/WwwCoderepo.pm | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index 5620bd0e..174c75ef 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -276,7 +276,7 @@ sub scan_projects_coderepo ($$$) { sub parse_cgitrc { my ($self, $cgitrc, $nesting) = @_; - $cgitrc //= $self->{'publicinbox.cgitrc'}; + $cgitrc //= $self->{'publicinbox.cgitrc'} // return; if ($nesting == 0) { # defaults: my %s = map { $_ => 1 } qw(/cgit.css /cgit.png @@ -388,6 +388,7 @@ sub repo_objs { my ($self, $ibxish) = @_; my $ibx_code_repos = $ibxish->{coderepo} // return; $ibxish->{-repo_objs} // do { + parse_cgitrc($self, undef, 0); my $code_repos = $self->{-code_repos}; my @repo_objs; for my $nick (@$ibx_code_repos) { diff --git a/lib/PublicInbox/WwwCoderepo.pm b/lib/PublicInbox/WwwCoderepo.pm index 99df39ef..1a8754c4 100644 --- a/lib/PublicInbox/WwwCoderepo.pm +++ b/lib/PublicInbox/WwwCoderepo.pm @@ -27,8 +27,7 @@ sub prepare_coderepos { my $pi_cfg = $self->{pi_cfg}; # TODO: support gitweb and other repository viewers? - defined($pi_cfg->{'publicinbox.cgitrc'}) and - $pi_cfg->parse_cgitrc(undef, 0); + $pi_cfg->parse_cgitrc(undef, 0); my $code_repos = $pi_cfg->{-code_repos}; for my $k (grep(/\Acoderepo\.(?:.+)\.dir\z/, keys %$pi_cfg)) { |