[Scoop-checkins] scoop/lib/Scoop Cache.pm Utility.pm

[scoop at lithium.sabren.com]

Update of /cvs/scoop/scoop/lib/Scoop
In directory lithium.sabren.com:/tmp/cvs-serv7737/lib/Scoop

Modified Files:
	Cache.pm Utility.pm 
Log Message:
Checking in hillct's misc. error fix patch. -ct


Index: Utility.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Utility.pm,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** Utility.pm	21 Jan 2005 14:14:30 -0000	1.35
--- Utility.pm	8 Feb 2006 03:42:02 -0000	1.36
***************
*** 1090,1094 ****
  	my $S = shift;
  	my $string = shift;
! 
  	# Interpolate the string here, so that %%replaced%% bits get escaped
  	# as well
--- 1090,1094 ----
  	my $S = shift;
  	my $string = shift;
! 	return unless $string;
  	# Interpolate the string here, so that %%replaced%% bits get escaped
  	# as well

Index: Cache.pm
===================================================================
RCS file: /cvs/scoop/scoop/lib/Scoop/Cache.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Cache.pm	21 Jan 2005 14:14:30 -0000	1.8
--- Cache.pm	8 Feb 2006 03:42:02 -0000	1.9
***************
*** 291,295 ****
  sub _calculate_size {
  	my $self = shift;
! 	my $data = shift;
  
  	if (ref($data) eq 'HASH') {
--- 291,295 ----
  sub _calculate_size {
  	my $self = shift;
! 	my $data = shift || '';
  
  	if (ref($data) eq 'HASH') {