[Cvs-cvs] ccvs/contrib ChangeLog log_accum.pl

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Changes by:     Derek Robert Price <dprice>     06/07/24 12:35:37

Modified files:
        contrib        : ChangeLog log_accum.pl 

Log message:
        * log_accum.pl: Actually remove temporary files.  Sanity check that
        commit_prep ran first, exiting if not, as documented.
        (Patch from Sylvain Beucler <address@hidden>.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/contrib/ChangeLog?cvsroot=cvs&r1=1.208&r2=1.209
http://cvs.savannah.gnu.org/viewcvs/ccvs/contrib/log_accum.pl?cvsroot=cvs&r1=1.44&r2=1.45

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/contrib/ChangeLog,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -b -r1.208 -r1.209
--- ChangeLog   27 Jun 2006 02:07:57 -0000      1.208
+++ ChangeLog   24 Jul 2006 12:35:37 -0000      1.209
@@ -1,3 +1,9 @@
+2006-07-24  Derek Price  <address@hidden>
+
+       * log_accum.pl: Actually remove temporary files.  Sanity check that
+       commit_prep ran first, exiting if not, as documented.
+       (Patch from Sylvain Beucler <address@hidden>.)
+
 2006-06-26  Derek Price  <address@hidden>
 
        * log_accum.pl (compile_subject): Keep slashes in paths.

Index: log_accum.pl
===================================================================
RCS file: /cvsroot/cvs/ccvs/contrib/log_accum.pl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- log_accum.pl        27 Jun 2006 02:07:57 -0000      1.44
+++ log_accum.pl        24 Jul 2006 12:35:37 -0000      1.45
@@ -1203,15 +1203,17 @@
     die "$tmpdir does not exist" unless -d $tmpdir;
     opendir DIR, $tmpdir or die "Can't read $tmpdir: $!";
 
-    while (readdir DIR)
+    foreach (readdir DIR)
     {
        # Matching a subpattern of a regexp untaints the file names...
-       /^(#\Q$prefix\E\.$id\..*)$/;
+       if (/^(\#\Q$prefix\E\.$id\..*)$/) {
        push @files, $1;
     }
+    }
     closedir DIR;
 
     # Delete the files.
+    print STDERR 'Removing ' . join(', ', @files) if $debug;
     map { unlink "$tmpdir/$_" } @files;
 }
 
@@ -1442,6 +1444,11 @@
            print STDERR "More commits to come...\n" if $debug;
            return 0;
        }
+    } else {
+       cleanup_tmpfiles $TMPDIR, $config->{'file-text'}, $id;
+       die "* Fatal error: $LAST_FILE is not present.\n"
+           . "  It should have been generated by commit_prep.\n"
+           . "  Check your CVSROOT/commitinfo file.";
     }
 
     ###