[interchange-cvs] interchange - heins modified lib/Vend/Scan.pm

[interchange-core@interchange.redhat.com]

User:      heins
Date:      2001-11-20 04:20:53 GMT
Modified:  lib/Vend Scan.pm
Log:
 * Fix phantom database problem researched by Chris Ochs. The problem
   was auto-vivification of a Vend::Cfg->{Database} entry, causing a
   problem in PreFork mode.

   This problem was plaguing a lot of people and I wouldn't have found
   it without Chris's fine work.

Revision  Changes    Path
2.2       +5 -5      interchange/lib/Vend/Scan.pm


rev 2.2, prev_rev 2.1
Index: Scan.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Scan.pm,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -r2.1 -r2.2
--- Scan.pm	2001/10/29 23:31:57	2.1
+++ Scan.pm	2001/11/20 04:20:53	2.2
@@ -1,6 +1,6 @@
 # Vend::Scan - Prepare searches for Interchange
 #
-# $Id: Scan.pm,v 2.1 2001/10/29 23:31:57 jon Exp $
+# $Id: Scan.pm,v 2.2 2001/11/20 04:20:53 mheins Exp $
 #
 # Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -29,7 +29,7 @@
 			perform_search
 			);
 
-$VERSION = substr(q$Revision: 2.1 $, 10);
+$VERSION = substr(q$Revision: 2.2 $, 10);
 
 use strict;
 use Vend::Util;
@@ -622,7 +622,7 @@
 		if($db) {
 			$codename = $db->config('KEY') || 'code';
 			$nuhash = $db->config('NUMERIC') || undef;
-			push_spec( 'fi', $Vend::Cfg->{Database}{$t}{'file'}, $ary, $hash);
+			push_spec( 'fi', $Vend::Cfg->{Database}{$t}{file}, $ary, $hash);
 		}
 # GLIMPSE
 		elsif ("\L$t" eq 'glimpse') {
@@ -893,8 +893,8 @@
 			$ok = 1 if $::Scratch->{$_};
 		}
 		if($_ !~ /\./) {
-			$_ = $Vend::Cfg->{Database}{$_}{'file'}
-				if defined $Vend::Cfg->{Database}{$_}{'file'};
+			$_ = $Vend::Cfg->{Database}{$_}{file}
+				if defined $Vend::Cfg->{Database}{$_};
 		}
 		if ($ok and $Vend::Cfg->{NoSearch}) {
 			if (/$Vend::Cfg->{NoSearch}/) {