aboutsummaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorwill <will@FreeBSD.org>2000-12-09 03:54:54 +0800
committerwill <will@FreeBSD.org>2000-12-09 03:54:54 +0800
commit587e5f7bdf74a2385892f18fa3ef4874706c9abf (patch)
treead3287192d9b4f0140536c04565cdd9659365237 /Tools
parentf5ff2bee20155a56b3646325da72e1c26d819634 (diff)
downloadfreebsd-ports-gnome-587e5f7bdf74a2385892f18fa3ef4874706c9abf.tar.gz
freebsd-ports-gnome-587e5f7bdf74a2385892f18fa3ef4874706c9abf.tar.zst
freebsd-ports-gnome-587e5f7bdf74a2385892f18fa3ef4874706c9abf.zip
Functional modification: Make -n only apply to cvs commit, NOT *all*
cvs ops. Many committers found it difficult to debug while using addport with the -n argument. I'm inclined to agree with the sentiment. Submitted by: sada, deischen, others
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/scripts/addport6
1 files changed, 3 insertions, 3 deletions
diff --git a/Tools/scripts/addport b/Tools/scripts/addport
index a7db2e960896..27554aa7e1b1 100755
--- a/Tools/scripts/addport
+++ b/Tools/scripts/addport
@@ -50,7 +50,7 @@ my $distdir = $opts{'s'} if ($opts{'s'} ne "");
my $dir = $opts{'d'};
my $h = "freefall.FreeBSD.org";
$h = $opts{'h'} if ($opts{'h'} ne "");
-my $n = ""; $n = "-n " if $opts{'n'};
+my $n = ""; $n = "-n" if $opts{'n'};
my $u = $ENV{USER};
$u = $opts{'u'} if ($opts{'u'} ne "");
my $more_testing = $opts{'t'};
@@ -83,7 +83,7 @@ if ($myhost ne lc($h)) {
$repo = "/home/ncvs" if !$ENV{CVSROOT};
}
$repo = "$ENV{CVSROOT}" if $ENV{CVSROOT};
-my $cvs = "cvs $n-d $repo";
+my $cvs = "cvs -d $repo";
# stuff that always happens when we start
BEGIN {
@@ -234,7 +234,7 @@ foreach my $thisdir (@dirs) {
# commit the actual port.
chdir "$tmpdir/$category" or err(1, "$tmpdir/$category");
- system("$cvs ci Makefile $portname") && errx(1, "cvs commit failed, aborting.");
+ system("$cvs $n ci Makefile $portname") && errx(1, "cvs commit failed, aborting.");
system("$ssh $perl /usr/local/bin/modulesupdate $module ports/$category/$portname") && errx(1, "adding port to modules failed, aborting.");
}