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

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Thu Mar 2 07:27:31 EST 2006


User:      heins
Date:      2006-03-02 12:27:31 GMT
Modified:  lib/Vend Config.pm
Log:
* Prevent Interchange crash when SocketFile not in interchange.cfg.

* Add ConfigParseComments as a "warn", prevents killing virtually every
  catalog in the world when you upgrade. Allow some grace period in
  updating catalog.cfg.

Revision  Changes    Path
2.199     +6 -4      interchange/lib/Vend/Config.pm


rev 2.199, prev_rev 2.198
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.198
retrieving revision 2.199
diff -u -r2.198 -r2.199
--- Config.pm	2 Mar 2006 07:12:27 -0000	2.198
+++ Config.pm	2 Mar 2006 12:27:31 -0000	2.199
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.198 2006/03/02 07:12:27 jon Exp $
+# $Id: Config.pm,v 2.199 2006/03/02 12:27:31 mheins Exp $
 #
 # Copyright (C) 2002-2006 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -54,7 +54,7 @@
 use Vend::Data;
 use Vend::Cron;
 
-$VERSION = substr(q$Revision: 2.198 $, 10);
+$VERSION = substr(q$Revision: 2.199 $, 10);
 
 my %CDname;
 my %CPname;
@@ -432,7 +432,7 @@
 										  ],
 	['EncryptProgram',  'executable',		 [ 'gpg', 'pgpe', 'none', ] ],
 	['PIDfile',     	 'root_dir',         "etc/$Global::ExeName.pid"],
-	['SocketFile',     	 'root_dir_array',   undef],
+	['SocketFile',     	 'root_dir_array',   ''],
 	['SocketPerms',      'integer',          0600],
 	['SOAP',     	     'yesno',            'No'],
 	['SOAP_Socket',       'array',            ''],
@@ -450,6 +450,7 @@
 	['HouseKeepingCron', 'cron',          ''],
 	['Mall',	          'yesno',           'No'],
 	['TagGroup',		 'tag_group',		 $StdTags],
+	['ConfigParseComments',		 'warn',		 ''],
 	['TagInclude',		 'tag_include',		 'ALL'],
 	['ActionMap',		 'action',			 ''],
 	['FileControl',		 'action',			 ''],
@@ -565,6 +566,7 @@
 	['SessionDB',  		 undef,     		 ''],
 	['SessionType', 	 undef,     		 'File'],
 	['SessionDatabase',  'relative_dir',     'session'],
+	['ConfigParseComments',		 'warn',		 ''],
 	['SessionLockFile',  undef,     		 'etc/session.lock'],
 	['MoreDB',			 'yesno',     		 'No'],
 	['DatabaseDefault',  'hash',	     	 ''],
@@ -3379,7 +3381,7 @@
 				},
 		SocketFile => sub {
 					@$Global::SocketFile = "$Global::VendRoot/etc/socket"
-						unless @$Global::SocketFile;
+						unless @$Global::SocketFile and $Global::SocketFile->[0];
 					return 1;
 				},
 		TcpMap => sub {








More information about the interchange-cvs mailing list