[gentoo-commits] proj/gitolite-gentoo:master commit in: /

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

commit:     3a435b0a3c586c112ea8e1b29524c6a838721984
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 17 19:05:35 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Mon Oct 17 19:05:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gitolite-gentoo.git;a=commit;h=3a435b0a

Merge branch 't/find_pubkeys-function'

Conflicts:
	src/gitolite.pm


 src/gitolite.pm |   43 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)

diff --cc src/gitolite.pm
index 3cb87ab,b10da00..bb60cf7
--- a/src/gitolite.pm
+++ b/src/gitolite.pm
@@@ -1304,76 -1261,37 +1304,119 @@@ sub find_pubkeys 
      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);
 +}
 +
 +sub export_key_metadata {
 +    my $user = shift;
 +
 +    my @tmp = find_pubkeys($GL_KEYDIR, $user);
 +    return if $#tmp ne 0; # one pubkey only!
 +
 +    my $pubkey = $tmp[0];
 +
 +    return if ! -f $pubkey;
 +
 +    open(PUBKEY, '<', $pubkey);
 +    while(defined(my $line = <PUBKEY>)) {
 +        chomp($line);
 +        next if $line !~ m/^\s*#/;
 +        $line =~ s/^\s*#\s*//;
 +
 +        my ($variable, $value) = split(/:\s*/, $line, 2);
 +
 +        if(grep(/^\Q${variable}\E$/, @GL_METADATA)) {
 +            if(length($value) > 0) {
 +                $variable =~ s/-/_/g;
 +                $ENV{$variable} = $value;
 +            }
 +        }
 +    }
 +    close(PUBKEY);
 +}
 +
 +sub get_repo_umask {
 +    my $repo = shift;
 +
 +    return $REPO_UMASK if ! $repo;
 +
 +    do $GL_CONF_COMPILED if ! %repos;
 +
 +    return $REPO_UMASK if ! $repos{$repo};
 +    return $repos{$repo}{"umask"} ? $repos{$repo}{"umask"} : $REPO_UMASK;
 +}
 +
++# ----------------------------------------------------------------------------
++#       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;