[interchange-cvs] interchange - heins modified 2 files

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2008-07-28 20:49:13 GMT
Modified:  lib/Vend Tag: STABLE_5_4-branch Cron.pm Interpolate.pm
Log:
* Fix bug in my commit found by Racke

Revision  Changes    Path
No                   revision



No                   revision



2.2.2.2              interchange/lib/Vend/Cron.pm


rev 2.2.2.2, prev_rev 2.2.2.1
Index: Cron.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Cron.pm,v
retrieving revision 2.2.2.1
retrieving revision 2.2.2.2
diff -u -r2.2.2.1 -r2.2.2.2
--- Cron.pm	30 Mar 2007 12:15:27 -0000	2.2.2.1
+++ Cron.pm	28 Jul 2008 20:49:13 -0000	2.2.2.2
@@ -1,6 +1,6 @@
 # Vend::Cron - Determine tasks to run based on time
 #
-# $Id: Cron.pm,v 2.2.2.1 2007-03-30 12:15:27 pajamian Exp $
+# $Id: Cron.pm,v 2.2.2.2 2008-07-28 20:49:13 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.2.1 $, 10);
+$VERSION = substr(q$Revision: 2.2.2.2 $, 10);
 
 use POSIX qw(strftime);
 use Vend::Util;
@@ -31,7 +31,13 @@
 
 no warnings qw(uninitialized);
 
-use Set::Crontab;
+BEGIN {
+  eval {
+	require Set::Crontab;
+	import Set::Crontab;
+	$Vend::Cron::Loaded = 1;
+  };
+}
 
 my @periods = (
 	[0 .. 59],



2.261.2.8            interchange/lib/Vend/Interpolate.pm


rev 2.261.2.8, prev_rev 2.261.2.7
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.261.2.7
retrieving revision 2.261.2.8
diff -u -r2.261.2.7 -r2.261.2.8
--- Interpolate.pm	16 Jun 2008 14:39:57 -0000	2.261.2.7
+++ Interpolate.pm	28 Jul 2008 20:49:13 -0000	2.261.2.8
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.261.2.7 2008-06-16 14:39:57 mheins Exp $
+# $Id: Interpolate.pm,v 2.261.2.8 2008-07-28 20:49:13 mheins Exp $
 #
 # Copyright (C) 2002-2005 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.261.2.7 $, 10);
+$VERSION = substr(q$Revision: 2.261.2.8 $, 10);
 
 @EXPORT = qw (
 
@@ -5847,7 +5847,6 @@
 			if(not $sort = $l->{sort}) {
 				$sort = $type eq 'handling' ? 100 : 500;
 			}
-			$l->{description} = '';
 
 			my @modes = split /\0/, $mode;
 			for my $m (@modes) {