[interchange-cvs] interchange - heins modified dist/lib/UI/Primitive.pm

[interchange-core@interchange.redhat.com]

User:      heins
Date:      2001-11-02 14:09:53 GMT
Modified:  dist/lib/UI Primitive.pm
Log:
	* Minor fix to image regex, debug removed.

Revision  Changes    Path
2.7       +7 -2      interchange/dist/lib/UI/Primitive.pm


rev 2.7, prev_rev 2.6
Index: Primitive.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/dist/lib/UI/Primitive.pm,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -r2.6 -r2.7
--- Primitive.pm	2001/10/09 22:32:52	2.6
+++ Primitive.pm	2001/11/02 14:09:53	2.7
@@ -1,6 +1,6 @@
 # UI::Primitive - Interchange configuration manager primitives
 
-# $Id: Primitive.pm,v 2.6 2001/10/09 22:32:52 mheins Exp $
+# $Id: Primitive.pm,v 2.7 2001/11/02 14:09:53 mheins Exp $
 
 # Copyright (C) 1998-2001 Red Hat, Inc. <interchange@redhat.com>
 
@@ -25,7 +25,7 @@
 
 package UI::Primitive;
 
-$VERSION = substr(q$Revision: 2.6 $, 10);
+$VERSION = substr(q$Revision: 2.7 $, 10);
 $DEBUG = 0;
 
 use vars qw!
@@ -476,9 +476,14 @@
 	$suf = '\.(GIF|gif|JPG|JPEG|jpg|jpeg|png|PNG)'
 		unless $suf;
 	my @names;
+	my $regex;
+	eval {
+		$regex = qr{$suf$}o;
+	};
+	return undef if $@;
 	my $wanted = sub {
 					return undef unless -f $_;
-					return undef unless /$suf$/o;
+					return undef unless $_ =~ $regex;
 					my $n = $File::Find::name;
 					$n =~ s:^$base/?::;
 					push(@names, $n);
@@ -820,7 +825,7 @@
 		ref $view_hash
 			and @$record{keys %$view_hash} = values %$view_hash;
 	}
-::logDebug("return meta_record=" . ::uneval($record) );
+#::logDebug("return meta_record=" . ::uneval($record) );
 	return $record;
 }