r68291 - in /branches/upstream/libmodule-load-conditional-perl/current: CHANGES META.yml lib/Module/Load/Conditional.pm

[periapt-guest at users.alioth.debian.org]

Author: periapt-guest
Date: Thu Feb 10 20:13:17 2011
New Revision: 68291

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=68291
Log:
[svn-upgrade] new version libmodule-load-conditional-perl (0.44)

Modified:
    branches/upstream/libmodule-load-conditional-perl/current/CHANGES
    branches/upstream/libmodule-load-conditional-perl/current/META.yml
    branches/upstream/libmodule-load-conditional-perl/current/lib/Module/Load/Conditional.pm

Modified: branches/upstream/libmodule-load-conditional-perl/current/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-load-conditional-perl/current/CHANGES?rev=68291&op=diff
==============================================================================
--- branches/upstream/libmodule-load-conditional-perl/current/CHANGES (original)
+++ branches/upstream/libmodule-load-conditional-perl/current/CHANGES Thu Feb 10 20:13:17 2011
@@ -1,3 +1,12 @@
+Changes for 0.44    Wed Feb  9 21:48:42 GMT 2011
+=================================================
+* Apply podchecker patch from Michael Stevens RT #65601
+
+Changes for 0.42    Wed Feb  9 15:27:14 GMT 2011
+=================================================
+* Apply patch from Phillip Moore RT #60916, which
+  fixes an edge-case with obj/ref @INC entries.
+
 Changes for 0.40    Fri Jan  7 21:45:01 GMT 2011
 =================================================
 * Apply blead patch from Peter Acklam

Modified: branches/upstream/libmodule-load-conditional-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-load-conditional-perl/current/META.yml?rev=68291&op=diff
==============================================================================
--- branches/upstream/libmodule-load-conditional-perl/current/META.yml (original)
+++ branches/upstream/libmodule-load-conditional-perl/current/META.yml Thu Feb 10 20:13:17 2011
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               Module-Load-Conditional
-version:            0.40
+version:            0.44
 abstract:           Looking up module information / loading at runtime
 author:
     - Jos Boumans <kane[at]cpan.org>

Modified: branches/upstream/libmodule-load-conditional-perl/current/lib/Module/Load/Conditional.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libmodule-load-conditional-perl/current/lib/Module/Load/Conditional.pm?rev=68291&op=diff
==============================================================================
--- branches/upstream/libmodule-load-conditional-perl/current/lib/Module/Load/Conditional.pm (original)
+++ branches/upstream/libmodule-load-conditional-perl/current/lib/Module/Load/Conditional.pm Thu Feb 10 20:13:17 2011
@@ -18,7 +18,7 @@
                         $FIND_VERSION $ERROR $CHECK_INC_HASH];
     use Exporter;
     @ISA            = qw[Exporter];
-    $VERSION        = '0.40';
+    $VERSION        = '0.44';
     $VERBOSE        = 0;
     $DEPRECATED     = 0;
     $FIND_VERSION   = 1;
@@ -85,7 +85,7 @@
 
 =head1 Methods
 
-=head1 $href = check_install( module => NAME [, version => VERSION, verbose => BOOL ] );
+=head2 $href = check_install( module => NAME [, version => VERSION, verbose => BOOL ] );
 
 C<check_install> allows you to verify if a certain module is installed
 or not. You may call it with the following arguments:
@@ -204,6 +204,8 @@
             if ( ref $dir ) {
                 ### @INC hook -- we invoke it and get the filehandle back
                 ### this is actually documented behaviour as of 5.8 ;)
+
+                my $existed_in_inc = $INC{$file_inc};
     
                 if (UNIVERSAL::isa($dir, 'CODE')) {
                     ($fh) = $dir->($dir, $file);
@@ -222,6 +224,8 @@
                 }
     
                 $filename = $INC{$file_inc} || $file;
+
+                delete $INC{$file_inc} if not $existed_in_inc;
     
             } else {
                 $filename = File::Spec->catfile($dir, $file);