[Savannah-cvs] administration/infra/bin install-log-accum.pl

[Sylvain Beucler]

CVSROOT:        /cvsroot/administration
Module name:    administration
Branch:         
Changes by:     Sylvain Beucler <address@hidden>        05/02/05 08:37:28

Modified files:
        infra/bin      : install-log-accum.pl 

Log message:
        Does the co before checking whether the file exists
        Uses -u in ci to keep the working copy after the checkin

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/administration/administration/infra/bin/install-log-accum.pl.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: administration/infra/bin/install-log-accum.pl
diff -u administration/infra/bin/install-log-accum.pl:1.13 
administration/infra/bin/install-log-accum.pl:1.14
--- administration/infra/bin/install-log-accum.pl:1.13  Sat Feb  5 08:32:16 2005
+++ administration/infra/bin/install-log-accum.pl       Sat Feb  5 08:37:28 2005
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- perl -*-
 #
-# $Id: install-log-accum.pl,v 1.13 2005/02/05 08:32:16 Beuc Exp $
+# $Id: install-log-accum.pl,v 1.14 2005/02/05 08:37:28 Beuc Exp $
 
 use strict;
 use warnings;
@@ -232,15 +232,15 @@
     # Absolute path to the commitinfo file
     my $commitinfo_file = "$cvsroot/CVSROOT/commitinfo";
 
+    # Checks out the file for editing
+    system('co', '-q', '-l', "$cvsroot/CVSROOT/loginfo");
+
     # Make sure `$commitinfo_file' exists
     die "File `$commitinfo_file' doesn't exist!" if ! -f $commitinfo_file;
 
     # commitinfo line we'll be writing
     my $commitinfo_line = "$regex $commit_prep_prog -r -T $text";
 
-    # Checks out the file for editing
-    system('co', '-q', '-l', "$cvsroot/CVSROOT/loginfo");
-
     # Open `$commitinfo_file', write `$commitinfo_line' and close
     # `$commitinfo_file'.
     print "Writing commitinfo file `$commitinfo_file'\n" if $opt_verbose;
@@ -249,7 +249,7 @@
     close CINFO;
 
     # Checks in the file
-    system('ci', '-q', '-mInstalled commit notification', 
"$cvsroot/CVSROOT/loginfo");
+    system('ci', '-q', 'u', '-mInstalled commit notification', 
"$cvsroot/CVSROOT/loginfo");
 }
 
 # write_loginfo($project, $cvsroot, $regex, $text, $module, $log_email, 
$context_diffs, $diff_email)
@@ -272,6 +272,9 @@
     # Absolute path to the loginfo file
     my $loginfo_file = "$cvsroot/CVSROOT/loginfo";
 
+    # Checks out the file for editing
+    system('co', '-q', '-l', "$cvsroot/CVSROOT/loginfo");
+
     # Make sure `$loginfo_file' exists
     die "File `$loginfo_file' doesn't exist!" if ! -f $loginfo_file;
 
@@ -283,9 +286,6 @@
     $loginfo_line .= " -D=$diff_email" if $diff_email ne '';
     $loginfo_line .= " %{sVv}";
 
-    # Checks out the file for editing
-    system('co', '-q', '-l', "$cvsroot/CVSROOT/loginfo");
-
     # Open `$loginfo_file', write `$loginfo_line' and close
     # `$loginfo_file'.
     print "Writing loginfo file `$loginfo_file'\n" if $opt_verbose;
@@ -294,7 +294,7 @@
     close LINFO;
 
     # Checks in the file
-    system('ci', '-q', '-mInstalled commit notification', 
"$cvsroot/CVSROOT/loginfo");
+    system('ci', '-q', 'u', '-mInstalled commit notification', 
"$cvsroot/CVSROOT/loginfo");
 }
 
 1;