aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2010-10-26 21:12:03 +0200
committerChristian Ruppert <idl0r@gentoo.org>2010-10-26 21:12:03 +0200
commitb4a695090c279f7b41b6805da0a67b787757d325 (patch)
tree5cb2841d5ef6368dde67fd5e452fa5ebcf694365
parentMerge branch 't/export-key-metadata' (diff)
parentImprove some warnings. (diff)
downloadgitolite-gentoo-b4a695090c279f7b41b6805da0a67b787757d325.tar.gz
gitolite-gentoo-b4a695090c279f7b41b6805da0a67b787757d325.tar.bz2
gitolite-gentoo-b4a695090c279f7b41b6805da0a67b787757d325.zip
Merge branch 't/minor'gitolite-1.5.6-gentoo
-rw-r--r--src/gitolite.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gitolite.pm b/src/gitolite.pm
index b579823..ea0bcc5 100644
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@ -875,7 +875,9 @@ sub setup_authkeys
if (@not_in_config > 10) {
print STDERR "$WARN You have " . scalar(@not_in_config) . " pubkeys that do not appear to be used in the config\n";
} elsif (@not_in_config) {
- print STDERR "$WARN the following users (pubkey files in parens) do not appear in the config file:\n", join(",", sort @not_in_config), "\n";
+ my $nic = join(", ", sort @not_in_config);
+ $nic =~ s/\Q$GL_KEYDIR\E\/?//g;
+ print STDERR "$WARN the following users (pubkey files in parens) do not appear in the config file:\n", $nic, "\n";
}
# lint check 3; a little more severe than the first two I guess...
@@ -887,7 +889,7 @@ sub setup_authkeys
if (@no_pubkey > 10) {
print STDERR "$WARN You have " . scalar(@no_pubkey) . " users WITHOUT pubkeys...!\n";
} elsif (@no_pubkey) {
- print STDERR "$WARN the following users have no pubkeys:\n", join(",", sort @no_pubkey), "\n";
+ print STDERR "$WARN the following users have no pubkeys:\n", join(", ", sort @no_pubkey), "\n";
}
}