[gentoo-commits] proj/gitolite-gentoo:t/export_key_metadata-function commit in: /

["Christian Ruppert" <idl0r@gentoo.org>]

commit:     d8dd968616a825bf8958a5d7e6cd245305225fb1
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 19:20:58 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 19:20:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=d8dd9686

Merge commit 'refs/top-bases/t/find_pubkeys-function' into t/find_pubkeys-function


 README.mkd                               |   30 +-
 conf/example.conf                        |  243 +---------
 conf/example.gitolite.rc                 |   26 +-
 contrib/adc/able                         |   20 +-
 contrib/adc/adc.common-functions         |    5 +
 contrib/adc/fork                         |    9 +-
 contrib/adc/get-rights-and-owner.in-perl |   15 +-
 contrib/adc/git                          |  123 +++++
 contrib/adc/gl-reflog                    |    8 +-
 contrib/adc/hub                          |  443 +++++++++++++++++
 contrib/adc/hub.mkd                      |  202 ++++++++
 contrib/adc/perms                        |  115 +++++
 contrib/adc/pygitolite.py                |   77 +++
 contrib/adc/rm                           |    4 +-
 contrib/adc/set-head                     |   17 +
 contrib/adc/who-pushed                   |    2 +-
 contrib/autotoc                          |   35 --
 contrib/gerrit.mkd                       |    2 +-
 contrib/gitolite-tools.mkd               |    2 +-
 contrib/gitweb/gitweb.conf               |   44 ++-
 contrib/ldap/README.mkd                  |    6 +-
 contrib/vim/README.mkd                   |    2 +-
 doc/1-INSTALL.mkd                        |   53 ++-
 doc/2-admin.mkd                          |   56 ++-
 doc/3-faq-tips-etc.mkd                   |  285 ++----------
 doc/CHANGELOG                            |   22 +
 doc/admin-defined-commands.mkd           |   14 +-
 doc/big-config.mkd                       |   14 +-
 doc/delegation.mkd                       |   10 +-
 doc/developer-notes.mkd                  |  213 ++++++++
 doc/gitolite.conf.mkd                    |  469 ++++++++++++++++++
 doc/gitolite.rc.mkd                      |   62 ++-
 doc/hook-propagation.mkd                 |    4 +-
 doc/http-backend.mkd                     |  142 +++++--
 doc/migrate.mkd                          |   10 +-
 doc/mirroring.mkd                        |   21 +-
 doc/mob-branches.mkd                     |    2 +-
 doc/monkeysphere.mkd                     |    2 +
 doc/overkill.mkd                         |    2 +-
 doc/packaging.mkd                        |    2 +-
 doc/progit-article.mkd                   |   14 +-
 doc/report-output.mkd                    |   19 +
 doc/shell-games.mkd                      |   25 +-
 doc/ssh-troubleshooting.mkd              |   42 ++-
 doc/uninstall.mkd                        |    2 +-
 doc/who-uses-it.mkd                      |    4 +-
 doc/wildcard-repositories.mkd            |   17 +-
 hooks/common/gl-pre-git.hub-sample       |   10 +
 hooks/common/update                      |   62 +--
 hooks/gitolite-admin/post-update         |    8 +-
 src/gitolite.pm                          |  775 +++++++++++++++---------------
 src/gitolite_env.pm                      |  157 ++++++
 src/gitolite_rc.pm                       |   70 +++
 src/gl-auth-command                      |  235 +++------
 src/gl-compile-conf                      |  141 ++----
 src/gl-dont-panic                        |   17 +-
 src/gl-easy-install                      |   16 +-
 src/gl-install                           |   33 +-
 src/gl-mirror-shell                      |   13 +-
 src/gl-mirror-sync                       |    4 +-
 src/gl-query-rc                          |   23 +
 src/gl-setup                             |   47 ++-
 src/gl-setup-authkeys                    |   64 ++--
 src/gl-time                              |   30 +-
 src/gl-tool                              |    9 +-
 src/sshkeys-lint                         |    6 +-
 t/README.mkd                             |   11 +-
 t/t53-check-info-expand-output           |   16 +
 t/t64-write-able                         |   11 +-
 t/t65-rsync                              |   83 ++++
 t/t67-hub                                |  174 +++++++
 t/test-driver.sh                         |   73 ++--
 72 files changed, 3483 insertions(+), 1541 deletions(-)

diff --cc src/gitolite.pm
index 7c240dc,c0581c8..a880037
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1162,47 -1143,6 +1143,49 @@@ sub ext_cmd_svnserv
      die "svnserve exec failed\n";
  }
  
 +# ----------------------------------------------------------------------------
 +#       Gentoo specific stuff
 +# ----------------------------------------------------------------------------
 +
 +# Find pubkeys recursive
 +sub find_pubkeys {
 +    my $dir = shift;
 +    my $name = shift;
 +    my @files = ();
 +    my @tmp = ();
 +
 +    opendir(my $dir_fh, $dir) or do { print STDERR "Error opendir(): $! '$dir'\n"; return @files; };
 +    foreach my $entry (readdir($dir_fh)) {
 +        next if $entry =~ /^\.\.?$/; # Skip . and .. entries.
 +        $entry = join("/", $dir, $entry);
 +
 +        if(-f $entry and $entry =~ /\.pub$/) {
 +            if(defined($name) && length($name) > 0) {
 +                my $cmp = $entry;
 +                $cmp =~ s(.*/)();
 +                $cmp =~ s/\.pub$//;
 +                if($cmp eq $name) {
 +                    push(@files, $entry);
 +                    next;
 +                }
 +            }
 +            else {
 +                push(@files, $entry);
 +                next;
 +            }
 +        }
 +        if(-d $entry) {
 +            @tmp = find_pubkeys($entry, $name);
 +            @files = (@files, @tmp);
 +            next;
 +        }
 +    }
 +
 +    closedir($dir_fh);
 +
 +    return sort(@files);
 +}
 +
+ # ------------------------------------------------------------------------------
+ # per perl rules, this should be the last line in such a file:
  1;