From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] cgit: fix fallout from lazy coderepo loading
Date: Thu, 18 Mar 2021 23:27:51 +0000 [thread overview]
Message-ID: <20210318232751.10575-1-e@80x24.org> (raw)
We can't completely instantiate our cgit wrapper without knowing
knowing cgit locations for serving static content.
Fixes: a5968dc059f655a ("config: lazy-load coderepos, support extindex")
---
lib/PublicInbox/Cgit.pm | 8 ++++++--
lib/PublicInbox/Config.pm | 4 ----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/PublicInbox/Cgit.pm b/lib/PublicInbox/Cgit.pm
index f38e8b6b..8ad07be2 100644
--- a/lib/PublicInbox/Cgit.pm
+++ b/lib/PublicInbox/Cgit.pm
@@ -53,14 +53,18 @@ sub locate_cgit ($) {
sub new {
my ($class, $pi_cfg) = @_;
my ($cgit_bin, $cgit_data) = locate_cgit($pi_cfg);
-
+ # TODO: support gitweb and other repository viewers?
+ if (defined(my $cgitrc = $pi_cfg->{-cgitrc_unparsed})) {
+ $pi_cfg->parse_cgitrc($cgitrc, 0);
+ }
my $self = bless {
cmd => [ $cgit_bin ],
cgit_data => $cgit_data,
pi_cfg => $pi_cfg,
}, $class;
- $pi_cfg->fill_all; # fill in -code_repos mapped to inboxes
+ # fill in -code_repos mapped to inboxes
+ $pi_cfg->each_inbox($pi_cfg->can('repo_objs'));
# some cgit repos may not be mapped to inboxes, so ensure those exist:
my $code_repos = $pi_cfg->{-code_repos};
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 1037c884..228de4ff 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -323,10 +323,6 @@ sub _fill_code_repo {
my ($self, $nick) = @_;
my $pfx = "coderepo.$nick";
- # TODO: support gitweb and other repository viewers?
- if (defined(my $cgitrc = delete $self->{-cgitrc_unparsed})) {
- parse_cgitrc($self, $cgitrc, 0);
- }
my $dir = $self->{"$pfx.dir"}; # aka "GIT_DIR"
unless (defined $dir) {
warn "$pfx.dir unset\n";
reply other threads:[~2021-03-18 23:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210318232751.10575-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).