From 62e70358466e381c2bd84b0ab71e678b5d700cfb Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Sat, 16 Jun 2007 21:29:25 +0100
Subject: [PATCH]   * 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.

---
 Debbugs/Control.pm  | 1 +
 scripts/errorlib.in | 6 ------
 scripts/expire.in   | 4 ++--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 1003e9c1..1d2fe4e1 100644
--- 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 24ce3331..85bc9ba6 100755
--- 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 11943ee1..2fbdcb77 100755
--- 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) {
-- 
2.39.5