Add debugging message reporting directive signature timestamp

diff --git a/testsuite/lib/upload.exp b/testsuite/lib/upload.exp
index 6c38d84e5495da77659a89fdd968aad34334e85e..53e2de8ab5d4b37eea2e781ec81d0a45144cbf7b 100644 (file)
--- a/testsuite/lib/upload.exp
+++ b/testsuite/lib/upload.exp
@@ -747,6 +747,12 @@ proc analyze_log { base_dir name assess } {
                     set A(validate,filename-mismatch-directive) 1
                     exp_continue
                 }
+       -re {^ftp-upload\[[0-9]+\]: \(Test\)\
+                DEBUG: Signature made [^\r\n]+} {
+                    # from read_directive_file, reporting signature timestamp
+                    set A(validate,signature-timestamp) 1
+                    exp_continue
+                }
 
        -re {^ftp-upload\[[0-9]+\]: \(Test\)\
                 DEBUG: [^ ]+ size is [[:digit:]]+} {

diff --git a/upload-ftp-v1.2.pl b/upload-ftp-v1.2.pl
index 0f0f42cdefe53b0f0a33712ec0e557b35acbef56..c2749919f374c209259789a0c75db50abdad2faa 100755 (executable)
--- a/upload-ftp-v1.2.pl
+++ b/upload-ftp-v1.2.pl
@@ -976,6 +976,9 @@ sub read_directive_file {
   # test of the $filename_required variable.
   if (($retval =~ /Signature made (.*)/) && ($filename_required)) {
     my $timestr = $1;
+
+    ftp_syslog('debug', "($log_style) DEBUG: Signature made $1") if DEBUG;
+
     # If the time/date string starts with a weekday (e.g. "Wed Apr 28 16:40:03 2004 EDT"),
     # chop off the weekday - Date::Manip doesn't like it
     $timestr =~ s/^[a-z]+? ([a-z]+)/$1/i;