* Add missing Received: line to the fakecontrol messages that we

    generate
  * Fix spool_dir typo in expire
  * Use die instead of quit
  * Ditch escapelog from errorlib.in really.

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 1003e9c1662ece47a05f43e6282ffe63c8cf39c2..1d2fe4e18f410e3b1349727d3fb8bd5a025722be 100644 (file)
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -461,6 +461,7 @@ sub __return_append_to_log_options{
      if (not exists $param{message}) {
          $action = $param{action} if exists $param{action};
          $param{message} = <<END;
+Received: (at fakecontrol) by fakecontrolmessage;
 To: $param{request_addr}
 From: $param{requester}
 Subject: Internal Control

diff --git a/scripts/errorlib.in b/scripts/errorlib.in
index 24ce3331fd774ae65a89cfb39f22c4387a58a33a..85bc9ba66f9349573a0561aa8053dcc5602541df 100755 (executable)
--- a/scripts/errorlib.in
+++ b/scripts/errorlib.in
@@ -51,12 +51,6 @@ sub get_addresses {
            map { Mail::Address->parse($_) } @_;
 }
 
-sub escapelog {
-       my @log = @_;
-       map { s/^([\01-\07\030])/\030$1/gm } @log;
-       return \@log;
-}
-
 @severities= grep { not exists $gObsoleteSeverities{$_} } @gSeverityList;
 @showseverities= @severities;
 grep ($_= $_ eq '' ? $gDefaultSeverity : $_, @showseverities);

diff --git a/scripts/expire.in b/scripts/expire.in
index 11943ee1ea65c63db78d4f4308e669ffa3d5c683..2fbdcb77067beb74b23e85d3577ba70d9dddd55f 100755 (executable)
--- a/scripts/expire.in
+++ b/scripts/expire.in
@@ -19,10 +19,10 @@ use Debbugs::Config qw(:config);
 # No $gRemoveAge means "never expire".
 exit 0 unless $config{remove_age};
 
-chdir($config{spool}) || die "chdir $config{spool} failed: $!\n";
+chdir($config{spool_dir}) || die "chdir $config{spool_dir} failed: $!\n";
 
 #get list of bugs (ie, status files)
-opendir(DIR,"db-h") || &quit("opendir db: $!\n");
+opendir(DIR,"db-h") or die "Unable to open dir db-h: $!";
 @dirs = sort { $a <=> $b } grep(s,^,db-h/,, grep(m/^\d+$/,readdir(DIR)));
 close(DIR);
 foreach my $dir (@dirs) {