sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use 'cvs ci -F ...' instead of setting the log file with EDITOR="cp ...".

Browse source 
This fixes addport for me on -stable (cvs was erroring out), and also
fixes addport when you have the EDITOR environment variable set.

Approved by:	will
This commit is contained in:
Pete Fritchman 2002-11-13 15:00:00 +00:00
parent 9d20507678
commit b0ca12cd09
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=70035
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Tools/scripts/addport
View file

@ -219,7 +219,6 @@ foreach my $thisdir (@dirs) {
if (!$autofill) {
if (-f $c) {
system("$mv $c $tmpdir/commitfile") or errx(1, "Oops, can't move commitfile!");
$commitfile = "EDITOR=\"cp $tmpdir/commitfile\"";
print "\nRemember, you asked to use a commit file to read for the commit log.\n";
print "This means you'll get a message saying the log message was unchanged or\n";
print "not specified. Just tell it to continue and it will be committed.\n\n";
@ -290,7 +289,6 @@ foreach my $thisdir (@dirs) {
print "\nRemember, you asked to use a commit file to read for the commit log.\n";
print "This means you'll get a message saying the log message was unchanged or\n";
print "not specified. Just tell it to continue and it will be committed.\n\n";
$commitfile = "EDITOR=\"cp $tmpdir/commitfile\"";
}
print "We're ready to commit.\n";
@ -341,7 +339,7 @@ foreach my $thisdir (@dirs) {
# commit the actual port.
chdir "$tmpdir/$category" or err(1, "$tmpdir/$category");
system("$commitfile $cvs $n ci Makefile $portname") && errx(1, "cvs commit failed, aborting.");
system("$cvs $n ci -F $tmpdir/commitfile Makefile $portname") && errx(1, "cvs commit failed, aborting.");
if (!$nomodules && ($n ne "-n")) {
system("$sshmod env CVSROOT=$repo $perl /usr/local/bin/modulesupdate $module ports/$category/$portname") && errx(1, "adding port to modules failed, aborting.");
}