diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-03-13 13:32:49 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-03-13 13:32:49 +0000 |
commit | 1f5bdf1f58f3993f2b8402e51070d086db63a291 (patch) | |
tree | 239cef81d446e9bfc044c6dcc0f72623105b4258 /pkgs/development/perl-modules/module-pluggable.patch | |
parent | 6e6624f4c54843d40ab97e44e8b5e0fb6cb339ba (diff) | |
download | nixlib-1f5bdf1f58f3993f2b8402e51070d086db63a291.tar nixlib-1f5bdf1f58f3993f2b8402e51070d086db63a291.tar.gz nixlib-1f5bdf1f58f3993f2b8402e51070d086db63a291.tar.bz2 nixlib-1f5bdf1f58f3993f2b8402e51070d086db63a291.tar.lz nixlib-1f5bdf1f58f3993f2b8402e51070d086db63a291.tar.xz nixlib-1f5bdf1f58f3993f2b8402e51070d086db63a291.tar.zst nixlib-1f5bdf1f58f3993f2b8402e51070d086db63a291.zip |
* Email::Send and dependencies.
svn path=/nixpkgs/trunk/; revision=8279
Diffstat (limited to 'pkgs/development/perl-modules/module-pluggable.patch')
-rw-r--r-- | pkgs/development/perl-modules/module-pluggable.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/pkgs/development/perl-modules/module-pluggable.patch b/pkgs/development/perl-modules/module-pluggable.patch new file mode 100644 index 000000000000..defe8e01ff64 --- /dev/null +++ b/pkgs/development/perl-modules/module-pluggable.patch @@ -0,0 +1,65 @@ +diff -rc Module-Pluggable-3.5-orig/lib/Module/Pluggable/Object.pm Module-Pluggable-3.5/lib/Module/Pluggable/Object.pm +*** Module-Pluggable-3.5-orig/lib/Module/Pluggable/Object.pm 2007-01-30 00:13:00.000000000 +0100 +--- Module-Pluggable-3.5/lib/Module/Pluggable/Object.pm 2007-03-13 14:29:34.000000000 +0100 +*************** +*** 136,147 **** + my $sp = catdir($dir, (split /::/, $searchpath)); + + # if it doesn't exist or it's not a dir then skip it +! next unless ( -e $sp && -d _ ); # Use the cached stat the second time + + my @files = $self->find_files($sp); + + # foreach one we've found + foreach my $file (@files) { + # untaint the file; accept .pm only + next unless ($file) = ($file =~ /(.*$file_regex)$/); + # parse the file to get the name +--- 136,148 ---- + my $sp = catdir($dir, (split /::/, $searchpath)); + + # if it doesn't exist or it's not a dir then skip it +! next unless ( -d $sp ); + + my @files = $self->find_files($sp); + + # foreach one we've found + foreach my $file (@files) { ++ + # untaint the file; accept .pm only + next unless ($file) = ($file =~ /(.*$file_regex)$/); + # parse the file to get the name +*************** +*** 161,167 **** + + my $err = $self->handle_finding_plugin($plugin); + carp "Couldn't require $plugin : $err" if $err; +! + push @plugins, $plugin; + } + +--- 162,168 ---- + + my $err = $self->handle_finding_plugin($plugin); + carp "Couldn't require $plugin : $err" if $err; +! + push @plugins, $plugin; + } + +*************** +*** 201,207 **** + (my $path = $File::Find::name) =~ s#^\\./##; + push @files, $path; + } +! }, $search_path ); + } + #chdir $cwd; + return @files; +--- 202,208 ---- + (my $path = $File::Find::name) =~ s#^\\./##; + push @files, $path; + } +! }, "$search_path/." ); + } + #chdir $cwd; + return @files; |