merge changes from dla source

diff --git a/scripts/process.in b/scripts/process.in
index 83d9667a009477c37306c1be440f046298b7dfd5..29dac8ab82bac7eb1c90130c7cc53e9a5e0949e5 100755 (executable)
--- a/scripts/process.in
+++ b/scripts/process.in
@@ -290,7 +290,7 @@ if ($codeletter eq 'D' || $codeletter eq 'F')
            $generalcc=''; 
         }
     } else { # Done
-        if (length($data->{done}) and
+        if (defined $data->{done} and length($data->{done}) and
                 not defined $pheader{'source-version'} and
                 not defined $pheader{'version'}) {
             &appendlog;

diff --git a/templates/en_US/mail/process_mark_as_forwarded.tmpl b/templates/en_US/mail/process_mark_as_forwarded.tmpl
index a3ace02dacadc6651a3bde868c65f7ef0aabce96..c099230fb8b15bd27cd29570d9af0f9d78c53318 100644 (file)
--- a/templates/en_US/mail/process_mark_as_forwarded.tmpl
+++ b/templates/en_US/mail/process_mark_as_forwarded.tmpl
@@ -1,6 +1,6 @@
 Your message dated {$date}
 with message-id {$messageid}
-has caused the $gProject $gBug report #$ref,
+has caused the {$gProject} {$gBug} report #{$ref},
 regarding {$data{subject}}
 to be marked as having been forwarded to the upstream software
 author(s) {$data{forwarded}}