Merge branch 'release-0.5'

Conflicts:

	ChangeLog
	bin/mythtv-status

diff --cc ChangeLog
index 32d55713b54db44720c48aa87cd22b75271a5b8e,0e76a94d5798708e4215f769adec43218a84fb47..db80d0778a7f325733e7a593ab2f725d727f09d6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,20 +1,28 @@@
-         conflicts.
+ 2007-12-07    Andrew Ruthven
+       Better suppress warnings from the MythTV Perl API if we can't access
+         the database.
+ 
+ 2007-12-06    Andrew Ruthven
+       Be more paranoid about handling error conditions in the
+         substitution code.
+       Handle the case where there is no next recording scheduled
+         in a nicer fashion.
+       Release version 0.5.3.
+ 
 +2007-12-02    Andrew Ruthven
 +      Allow sending emails only if there is low disk space or recording
++        conflicts. (0.6)
 +
  2007-11-28    Andrew Ruthven
        Be more wary about processing what the backend has sent us.
-               This includes cleaning up some invalid UTF-8 characters.
+       This includes cleaning up some invalid UTF-8 characters.
        Add support for reading XML from a file.
        Be a bit more forgiving on the XML we're receiving.
        Release version 0.5.2.
-       Show how much disk space is used - currently only total.
-       Rename "Time till next recording" to "Next Recording In".
++      Show how much disk space is used - currently only total. (0.6)
++      Rename "Time till next recording" to "Next Recording In". (0.6)
 +      Put all the one liners together in the output and make them line
-         up nicely.
++        up nicely. (0.6)
  
  2007-11-23    Andrew Ruthven
        Don't set the background when changing the colour.

diff --cc bin/mythtv-status
index 27c6ef8629c455143309ed8c1f27d36463c8385a,3eb521f45dad767b48a7c34eab5f3a2fdbdbd843..c2bacdd63583556ca89e11e650896c3ecfa06e69
--- 1/bin/mythtv-status
--- 2/bin/mythtv-status
+++ b/bin/mythtv-status
@@@ -29,9 -29,8 +29,9 @@@ my $email_only_on_alert = 0
  my $help = undef;
  my $xml_file = undef;
  my $verbose = 0;
 +my $disk_space_warn = 95;  # Percent to warn at.
  
- my $VERSION = '0.5.1';
+ my $VERSION = '0.5.3';
  
  GetOptions(
    'c|colour|color' => \$colour,
@@@ -104,10 -103,7 +104,10 @@@ my %defaults = 
     }
  );
  
- my $next_time = undef;
 +# The time of the next scheduled recording.
+ my $next_time = 'Never';
 +# Are there any alerts that should be notified via email?
 +my @alerts = ();
  
  # The blocks of output which we might generate.
  my @blocks = (
@@@ -171,14 -159,14 +171,14 @@@
      'hide'  => 'after',
      'subs' => {
        'find_next' => sub {
 -       my $vars = shift;
 +   my $vars = shift;
           return
 -         if defined $next_time && $next_time eq 'now';
 +     if defined $next_time && $next_time eq 'now';
  
           my $date = ParseDate($vars->{'startTime'});
-    if (! defined $next_time || Date_Cmp($date, $next_time) < 0) {
-      $next_time = $date
-    };
+        if ($next_time eq 'Never' || Date_Cmp($date, $next_time) < 0) {
+          $next_time = $date
+        };
         }
       }
    },