[interchange-cvs] interchange - heins modified 2 files

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2005-11-29 02:19:07 GMT
Modified:  lib/Vend Config.pm Cron.pm
Log:
* Allow installation without Set::Crontab module installed -- should not
  be a show-stopper.

Revision  Changes    Path
2.190     +12 -2     interchange/lib/Vend/Config.pm


rev 2.190, prev_rev 2.189
Index: Config.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Config.pm,v
retrieving revision 2.189
retrieving revision 2.190
diff -u -r2.189 -r2.190
--- Config.pm	15 Nov 2005 01:08:03 -0000	2.189
+++ Config.pm	29 Nov 2005 02:19:07 -0000	2.190
@@ -1,6 +1,6 @@
 # Vend::Config - Configure Interchange
 #
-# $Id: Config.pm,v 2.189 2005/11/15 01:08:03 jon Exp $
+# $Id: Config.pm,v 2.190 2005/11/29 02:19:07 mheins Exp $
 #
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -52,7 +52,7 @@
 use Vend::Data;
 use Vend::Cron;
 
-$VERSION = substr(q$Revision: 2.189 $, 10);
+$VERSION = substr(q$Revision: 2.190 $, 10);
 
 my %CDname;
 my %CPname;
@@ -3874,6 +3874,16 @@
 	my($var, $value) = @_;
 
 	return '' unless $value =~ /\s/ and $value =~ /[a-zA-Z]/;
+
+	unless($Vend::Cron::Loaded) {
+		 config_warn(
+			"Cannot use %s unless %s module loaded%s",
+			'crontab',
+			'Vend::Cron',
+			' (missing Set::Crontab?)',
+			);
+		 return '';
+	}
 	return Vend::Cron::read_cron($value);
 }
 



2.3       +7 -3      interchange/lib/Vend/Cron.pm


rev 2.3, prev_rev 2.2
Index: Cron.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Cron.pm,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- Cron.pm	17 May 2005 03:02:30 -0000	2.2
+++ Cron.pm	29 Nov 2005 02:19:07 -0000	2.3
@@ -1,6 +1,6 @@
 # Vend::Cron - Determine tasks to run based on time
 #
-# $Id: Cron.pm,v 2.2 2005/05/17 03:02:30 mheins Exp $
+# $Id: Cron.pm,v 2.3 2005/11/29 02:19:07 mheins Exp $
 #
 # Copyright (C) 2002-2005 Interchange Development Group
 #
@@ -22,7 +22,7 @@
 package Vend::Cron;
 
 use vars qw($VERSION);
-$VERSION = substr(q$Revision: 2.2 $, 10);
+$VERSION = substr(q$Revision: 2.3 $, 10);
 
 use POSIX qw(strftime);
 use Vend::Util;
@@ -31,7 +31,11 @@
 
 no warnings qw(uninitialized);
 
-use Set::Crontab;
+BEGIN {
+	require Set::Crontab;
+	import Set::Crontab;
+	$Vend::Cron::Loaded = 1;
+}
 
 my @periods = (
 	[0 .. 59],