← Back to branch summary

~ubuntu-branches/ubuntu/vivid/gitolite3/vivid-proposed

« back to all changes in this revision

Viewing changes to src/lib/Gitolite/Conf/Explode.pm

  • Committer: Package Import Robot
  • Author(s): David Bremner
  • Date: 2014-05-25 20:09:36 UTC
  • mfrom: (1.1.3)
  • Revision ID: package-import@ubuntu.com-20140525200936-el6hezd1fym50pxh
Tags: 3.6-1
http://bugs.debian.org/735176
* New upstream release
* Depend on ssh-server instead of openssh-server (Closes: #735176).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib/Gitolite/Conf/Explode.pm
43
43
            incsub( $1, $2, $3, $subconf, $out );
44
44
        } else {
45
45
            # normal line, send it to the callback function
 
46
            push @{$out}, "# $file $.";
46
47
            push @{$out}, $line;
47
48
        }
48
49
    }
56
57
 
57
58
    _die "invalid include/subconf file/glob '$include_glob'"
58
59
      unless $include_glob =~ /^"(.+)"$/
59
 
          or $include_glob =~ /^'(.+)'$/;
 
60
      or $include_glob =~ /^'(.+)'$/;
60
61
    $include_glob = $1;
61
62
 
62
 
    trace( 2, $is_subconf, $include_glob );
 
63
    trace( 3, $is_subconf, $include_glob );
63
64
 
64
65
    for my $file ( glob($include_glob) ) {
65
66
        _warn("included file not found: '$file'"), next unless -f $file;
103
104
    return 0 unless $included{$file_id}++;
104
105
 
105
106
    _warn("$file already included");
106
 
    trace( 2, "$file already included" );
 
107
    trace( 3, "$file already included" );
107
108
    return 1;
108
109
}
109
110