X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FExporter.pm;h=e3744145056e24a09241e61e32e791467ed3370d;hb=1446e948ba18726fe1c1ab437e5f9a9a6a1f2ace;hp=343b9fbd17462ccde1998504d3f5c5f2d2e4e5d9;hpb=d5e40bcc74e8447e12fdce80e14fb4fe6ee63b3e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/Exporter.pm b/lib/Exporter.pm
index 343b9fb..e374414 100644
--- a/lib/Exporter.pm
+++ b/lib/Exporter.pm
@@ -91,6 +91,12 @@ sub export {
 			@imports = @exports;
 			last;
 		    }
+		    # We need a way to emulate 'use Foo ()' but still
+		    # allow an easy version check: "use Foo 1.23, ''";
+		    if (@imports == 2 and !$imports[1]) {
+			@imports = ();
+			last;
+		    }
 		} elsif ($sym !~ s/^&// || !$exports{$sym}) {
 		    warn qq["$sym" is not exported by the $pkg module];
 		    $oops++;
@@ -176,9 +182,13 @@ sub export_fail {
 sub require_version {
     my($self, $wanted) = @_;
     my $pkg = ref $self || $self;
-    my $version = ${"${pkg}::VERSION"} || "(undef)";
-    Carp::croak("$pkg $wanted required--this is only version $version")
-		if $version < $wanted;
+    my $version = ${"${pkg}::VERSION"};
+    if (!$version or $version < $wanted) {
+	$version ||= "(undef)";
+	my $file = $INC{"$pkg.pm"};
+	$file &&= " ($file)";
+	Carp::croak("$pkg $wanted required--this is only version $version$file")
+    }
     $version;
 }