X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FEnv.pm;h=b0afc3b2dbf5e1c04ac75baf370b67065b29db1b;hb=8560c20dd6b2f3dfec719d4b500be45742de4507;hp=f2fe4af422e88de95077737bd2d1dcd0bfdb0277;hpb=aa6893958c2bfb6fa4ab923c8466c188c65748fd;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/Env.pm b/lib/Env.pm
index f2fe4af..b0afc3b 100644
--- a/lib/Env.pm
+++ b/lib/Env.pm
@@ -45,14 +45,14 @@ Chip Salzenberg E<lt>F<chip@fin.uucp>E<gt>
 sub import {
     my ($callpack) = caller(0);
     my $pack = shift;
-    my @vars = @_ ? @_ : keys(%ENV);
+    my @vars = grep /^[A-Za-z_]\w*$/, (@_ ? @_ : keys(%ENV));
     return unless @vars;
 
     eval "package $callpack; use vars qw("
 	 . join(' ', map { '$'.$_ } @vars) . ")";
     die $@ if $@;
     foreach (@vars) {
-	tie ${"${callpack}::$_"}, Env, $_ if /^[A-Za-z_]\w*$/;
+	tie ${"${callpack}::$_"}, Env, $_;
     }
 }