diff options
author | Will Andrews <will@FreeBSD.org> | 2000-12-08 19:54:54 +0000 |
---|---|---|
committer | Will Andrews <will@FreeBSD.org> | 2000-12-08 19:54:54 +0000 |
commit | 514c1d0973fe6e7537369451cf2253f5dc9e44c4 (patch) | |
tree | 9ccf484107b43252bf55b6d5347f93a7b56ccb91 /Tools | |
parent | Fix typo in kldload command. (diff) |
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
Notes
Notes:
svn path=/head/; revision=35776
Diffstat (limited to 'Tools')
-rwxr-xr-x | Tools/scripts/addport | 6 |
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."); } |