From owner-svn-ports-head@freebsd.org Sun Jan 24 18:42:29 2021 Return-Path: Delivered-To: svn-ports-head@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 AE73D4D59F1; Sun, 24 Jan 2021 18:42:29 +0000 (UTC) (envelope-from adamw@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DP2114fppz3wMy; Sun, 24 Jan 2021 18:42:29 +0000 (UTC) (envelope-from adamw@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 8901315D; Sun, 24 Jan 2021 18:42:29 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10OIgTOc000543; Sun, 24 Jan 2021 18:42:29 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10OIgTlH000542; Sun, 24 Jan 2021 18:42:29 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <202101241842.10OIgTlH000542@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sun, 24 Jan 2021 18:42:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r562503 - head/Tools/scripts X-SVN-Group: ports-head X-SVN-Commit-Author: adamw X-SVN-Commit-Paths: head/Tools/scripts X-SVN-Commit-Revision: 562503 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jan 2021 18:42:29 -0000 Author: adamw Date: Sun Jan 24 18:42:29 2021 New Revision: 562503 URL: https://svnweb.freebsd.org/changeset/ports/562503 Log: Tools/scripts/chkversion.pl: Guard against undefined values There are a few places where undefined values can creep in. While reinforcing defined values, use the defined-or (//) operator for some visual simplification. Modified: head/Tools/scripts/chkversion.pl Modified: head/Tools/scripts/chkversion.pl ============================================================================== --- head/Tools/scripts/chkversion.pl Sun Jan 24 18:36:02 2021 (r562502) +++ head/Tools/scripts/chkversion.pl Sun Jan 24 18:42:29 2021 (r562503) @@ -71,22 +71,22 @@ use POSIX; use File::Find; use Cwd 'abs_path'; -my $portsdir = $ENV{PORTSDIR} ? $ENV{PORTSDIR} : '/usr/ports'; -my $versiondir = $ENV{VERSIONDIR} ? $ENV{VERSIONDIR} : '/var/db/chkversion'; -my $svnblame = $ENV{SVNBLAME} ? 1 : 0; -my $allports = $ENV{ALLPORTS} ? 1 : 0; +my $portsdir = $ENV{PORTSDIR} // '/usr/ports'; +my $versiondir = $ENV{VERSIONDIR} // '/var/db/chkversion'; +my $svnblame = exists $ENV{SVNBLAME}; +my $allports = exists $ENV{ALLPORTS}; -my $watchre = $ENV{WATCH_REGEX} ? $ENV{WATCH_REGEX} : ''; -my $watchmre = $ENV{WATCHM_REGEX} ? $ENV{WATCHM_REGEX} : ''; -my $returnpath = $ENV{RETURNPATH} ? $ENV{RETURNPATH} : ''; -my $h_from = $ENV{HEADER_FROM} ? $ENV{HEADER_FROM} : "$ENV{USER}\@$ENV{HOST}"; -my $h_replyto = $ENV{HEADER_REPLYTO} ? $ENV{HEADER_REPLYTO} : $h_from; -my $rcpt_watch = $ENV{RCPT_WATCH} ? $ENV{RCPT_WATCH} : ''; -my $rcpt_watchm = $ENV{RCPT_WATCHM} ? $ENV{RCPT_WATCHM} : ''; -my $rcpt_orig = $ENV{RCPT_ORIGIN} ? $ENV{RCPT_ORIGIN} : ''; -my $rcpt_vers = $ENV{RCPT_VERSION} ? $ENV{RCPT_VERSION} : ''; -my $cc_author = $ENV{CC_AUTHOR} ? 1 : 0; -my $cc_mntnr = $ENV{CC_MAINTAINER} ? 1 : 0; +my $watchre = $ENV{WATCH_REGEX} // ''; +my $watchmre = $ENV{WATCHM_REGEX} // ''; +my $returnpath = $ENV{RETURNPATH} // ''; +my $h_from = $ENV{HEADER_FROM} // $ENV{USER} . '@' . ($ENV{HOST} // `/bin/hostname`); +my $h_replyto = $ENV{HEADER_REPLYTO} // $h_from; +my $rcpt_watch = $ENV{RCPT_WATCH} // ''; +my $rcpt_watchm = $ENV{RCPT_WATCHM} // ''; +my $rcpt_orig = $ENV{RCPT_ORIGIN} // ''; +my $rcpt_vers = $ENV{RCPT_VERSION} // ''; +my $cc_author = exists $ENV{CC_AUTHOR}; +my $cc_mntnr = exists $ENV{CC_MAINTAINER}; my $make = '/usr/bin/make'; my $svn = '/usr/local/bin/svn'; @@ -219,6 +219,7 @@ while () { my $result = $newversion eq $oldversion ? '=' : readfrom '', $pkg_version, '-t', $newversion, $oldversion; + $result //= ''; $watched{$origin} = "$version -> $pkgname{$origin}" if ($watch_re && $result ne '=' && $origin =~ /^(?:$watch_re)$/o);