From 2bcf4fcf21df607ba64bbd075450413a07f7dbd7 Mon Sep 17 00:00:00 2001 From: itojun Date: Tue, 15 Jul 1997 16:48:01 +0000 Subject: [PATCH] small change to prevent "modules" to be modified twice, on the following execution sequences: % easy-import -n foobaa % easy-import foobaa Reviewed by: joerg_wunsch@uriah.heep.sax.de --- gnu/usr.bin/cvs/contrib/easy-import.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/usr.bin/cvs/contrib/easy-import.pl b/gnu/usr.bin/cvs/contrib/easy-import.pl index 9caba25267d6..4a137148b381 100644 --- a/gnu/usr.bin/cvs/contrib/easy-import.pl +++ b/gnu/usr.bin/cvs/contrib/easy-import.pl @@ -8,7 +8,7 @@ # # Written by Jörg Wunsch, 95/03/07, and placed in the public domain. # -# $Id: easy-import.pl,v 1.12 1997/02/22 15:45:12 peter Exp $ +# $Id: easy-import.pl,v 1.13 1997/06/09 10:08:07 jmg Exp $ require "complete.pl"; require "getopts.pl"; @@ -22,7 +22,7 @@ sub scan_opts $dont_do_it = "-n" if $opt_n; if($opt_v) { - print STDERR '$Source: /home/ncvs/src/gnu/usr.bin/cvs/contrib/easy-import.pl,v $ $Revision: 1.12 $' . "\n"; # 'emacs kludge + print STDERR '$Source: /home/ncvs/src/gnu/usr.bin/cvs/contrib/easy-import.pl,v $ $Revision: 1.13 $' . "\n"; # 'emacs kludge exit 0; } die "usage: $0 [-v] [-n] [moduledir]\n" . @@ -374,7 +374,8 @@ if (!$branchimport) { "${modname} --> $area/${modpath}\" modules") && die "Commit failed\n"; - system("cvs $dont_do_it -Q release -d modules"); + # we always release "modules" to prevent duplicate + system("cvs -Q release -d modules"); } print "${so}Importing source. Enter a commit message in the editor.${se}\n";