From owner-svn-ports-all@freebsd.org Fri May 8 01:09:16 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 39DA52EB085; Fri, 8 May 2020 01:09:16 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49JC0D0q9Zz41Wt; Fri, 8 May 2020 01:09:16 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F16FF22220; Fri, 8 May 2020 01:09:15 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04819FMW044373; Fri, 8 May 2020 01:09:15 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04819Ftk044372; Fri, 8 May 2020 01:09:15 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202005080109.04819Ftk044372@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Fri, 8 May 2020 01:09:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r534313 - head/Tools/scripts X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: head/Tools/scripts X-SVN-Commit-Revision: 534313 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2020 01:09:16 -0000 Author: mandree Date: Fri May 8 01:09:15 2020 New Revision: 534313 URL: https://svnweb.freebsd.org/changeset/ports/534313 Log: Tools/scripts/bump_revision.pl: rename options to avoid astonishment. -n was more or less some "force" option, rename to -f -c was a dry-run option that's often called -n, rename accordingly. Modified: head/Tools/scripts/bump_revision.pl Modified: head/Tools/scripts/bump_revision.pl ============================================================================== --- head/Tools/scripts/bump_revision.pl Fri May 8 01:00:20 2020 (r534312) +++ head/Tools/scripts/bump_revision.pl Fri May 8 01:09:15 2020 (r534313) @@ -25,7 +25,7 @@ use Cwd; use Data::Dumper; use File::Basename; -use vars qw/$opt_c $opt_n $opt_i $opt_u $opt_l $opt_g $opt_p/; +use vars qw/$opt_n $opt_f $opt_i $opt_u $opt_l $opt_g $opt_p/; # launder environment delete @ENV{'IFS', 'CDPATH', 'ENV', 'BASH_ENV'}; @@ -38,8 +38,8 @@ Usage: $0 [options] [/] Options: -l - shaLlow, only bump ports with direct dependencies. -g - Grandchildren, also bump for indirect dependencies (default). - -c - Check only (dry-run), do not change Makefiles. - -n - No tmpdir, just use the directory where INDEX resides. + -n - Check only (dry-run), do not change Makefiles. + -f - No tmpdir, just use the directory where INDEX resides. -i - Use this for INDEX name. Defaults to \${PORTSDIR}/INDEX-n, where n is the major version of the OS, or \${PORTSDIR}/INDEX if missing. -p - Set portsdir, if different from /usr/ports. @@ -134,7 +134,7 @@ my $TMPDIR = File::Basename::dirname($INDEX); # # Sanity checking # -if (-d "$TMPDIR/.svn" and not $opt_n and not $opt_c) { +if (-d "$TMPDIR/.svn" and not $opt_f and not $opt_n) { die "$TMPDIR/.svn exists, cowardly refusing to proceed.\n"; } @@ -258,7 +258,7 @@ my $ports = join(" ", keys %DEPPORTS); # Create a temp directory and cvs checkout the ports # (don't do error checking, too complicated right now) # -unless ($opt_n or $opt_c) { +unless ($opt_f or $opt_n) { $TMPDIR = ".bump_revsion_pl_tmpdir.$$"; print "svn checkout into $TMPDIR...\n"; mkdir($TMPDIR, 0755); @@ -275,7 +275,7 @@ unless ($opt_n or $opt_c) { print "Updating Makefiles\n"; foreach my $p (sort keys(%DEPPORTS)) { print "- Updating Makefile of $p\n"; - next if $opt_c; + next if $opt_n; bumpMakefile "$p"; } } @@ -283,7 +283,7 @@ unless ($opt_n or $opt_c) { # # Commit the changes. Not automated. # -unless ($opt_c) { +unless ($opt_n) { print <