treewide: run update-copyrights from gnulib for 2019

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

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 56d146c2292f4cf83bc53936ffe4dffcb41e1dd4..2d663515648741c8ab1a94b52bbeba703efd3eb8 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used throughout the project for reading configuration
@@ -190,6 +190,9 @@ sub cgit_repo_merge ($$$) {
                return unless -e "$path/$se";
        }
        return if -e "$path/noweb";
+       # this comes from the cgit config, and AFAIK cgit only allows
+       # repos to have one URL, but that's just the PATH_INFO component,
+       # not the Host: portion
        # $repo = { url => 'foo.git', dir => '/path/to/foo.git' }
        my $rel = $repo->{url};
        unless (defined $rel) {
@@ -207,7 +210,7 @@ sub cgit_repo_merge ($$$) {
                        $rel =~ s!/?\.git\z!!;
        }
        $self->{"coderepo.$rel.dir"} //= $path;
-       $self->{"coderepo.$rel.cgiturl"} //= $rel;
+       $self->{"coderepo.$rel.cgiturl"} //= _array($rel);
 }
 
 sub is_git_dir ($) {
@@ -249,7 +252,7 @@ sub scan_projects_coderepo ($$$) {
                warn "failed to open cgit projectlist=$list: $!\n";
                return;
        };
-       foreach (<$fh>) {
+       while (<$fh>) {
                chomp;
                scan_path_coderepo($self, $path, "$path/$_");
        }
@@ -274,7 +277,7 @@ sub parse_cgitrc {
 
        # FIXME: this doesn't support macro expansion via $VARS, yet
        my $repo;
-       foreach (<$fh>) {
+       while (<$fh>) {
                chomp;
                if (m!\Arepo\.url=(.+?)/*\z!) {
                        my $nick = $1;
@@ -332,8 +335,9 @@ sub _fill_code_repo {
                                _array($self->{lc("$pfx.${t}UrlFormat")});
        }
 
-       if (my $cgits = $self->{lc("$pfx.cgitUrl")}) {
+       if (defined(my $cgits = $self->{"$pfx.cgiturl"})) {
                $git->{cgit_url} = $cgits = _array($cgits);
+               $self->{"$pfx.cgiturl"} = $cgits;
 
                # cgit supports "/blob/?id=%s", but it's only a plain-text
                # display and requires an unabbreviated id=