Permit empty lines or comments in the public key file that is passed to setup.gitolite-gentoo-3.6.3.1

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/src/lib/Gitolite/Setup.pm b/src/lib/Gitolite/Setup.pm
index 43de5d9..0c445ae 100644
--- a/src/lib/Gitolite/Setup.pm
+++ b/src/lib/Gitolite/Setup.pm
@@ -86,7 +86,8 @@ sub args {
     if ($pubkey) {
         $pubkey =~ /\.pub$/                 or _die "'$pubkey' name does not end in .pub";
         tsh_try("cat $pubkey")              or _die "'$pubkey' not a readable file";
-        tsh_lines() == 1                    or _die "'$pubkey' must have exactly one line";
+        @lines = grep {!/^(#|$)/} tsh_lines();
+        scalar(@lines) == 1                 or _die "'$pubkey' must have exactly one non-empty, non-comment line";
         tsh_try("ssh-keygen -l -f $pubkey") or _die "'$pubkey' does not seem to be a valid ssh pubkey file";
 
         $admin = $pubkey;