rescued changes

[migration-tools.git] / Equinox-Migration / lib / Equinox / Migration / SimpleTagList.pm

diff --git a/Equinox-Migration/lib/Equinox/Migration/SimpleTagList.pm b/Equinox-Migration/lib/Equinox/Migration/SimpleTagList.pm
index 596ec9b..9bce081 100644 (file)
--- a/Equinox-Migration/lib/Equinox/Migration/SimpleTagList.pm
+++ b/Equinox-Migration/lib/Equinox/Migration/SimpleTagList.pm
@@ -60,9 +60,9 @@ sub new {
         if (-r $args{file}) {
             $self->generate($args{file});
         } else {
-            die "Can't open tags file: $!\n";
+            die "Can't open tags file '", $args{file}, "': $!\n";
         }
-    } elsif ($args{str}) {
+    }elsif ($args{str}) {
         $self->generate($args{str},'scalar');
     }
 
@@ -86,7 +86,7 @@ or Perl will think you're passing a (possibly malformed) octal value.
 
 =cut
 
-sub has { my ($self, $t) = @_; $t =~ s/^0+//; return (defined $self->{tags}{$t}) ? 1 : 0 }
+sub has { my ($self, $t) = @_; return 0 unless $t; $t =~ s/^0+//; return (defined $self->{tags}{$t}) ? 1 : 0 }
 
 =head2 as_hashref
 
@@ -109,7 +109,7 @@ sub generate {
     my ($self, $file, $scalar) = @_;
 
     if ($scalar) {
-        open TAGFILE, '<:scalar', $file;
+        open TAGFILE, '<', \$file;
     } else {
         open TAGFILE, '<', $file;
     }