From nobody Sat Jul 9 01:53:57 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C66AB17D21A1; Sat, 9 Jul 2022 01:53:57 +0000 (UTC) (envelope-from git@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 4LftVF5GQkz4Hk4; Sat, 9 Jul 2022 01:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657331637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N6PaQwtDZr1m4ffR9Q0Kq2KAR3FJ8YQMgURCBqVVqds=; b=WpESlEiQMZO5/4RyBnaPOcou+nHZRm6nnYlz1ycoZuV90kAKDrjoB1+0H8klwEJEv9KT6K f0VaBA2vSKTZxlCsgqtS9XZ1OJWocTvH2ZC+NPa1UltmaJySZLcc7fPAr8/aBB8z6rzkkM He0EY1sOqYUmnxvRRhpcjXqle+YWclJeYveY8z3UPBUnlMGWIi84ZQ8Vtm8TMzSGsFjcJu IukEoOxqDxg6zdyOhhB75WKNt9hZwsvn/M3P89miT3tFnS6JdfHB7n2GQQecl1R+znlyng sPRy5xF4ILlPws4PAUJ1m6ontGQUxmonmnllI05wJ2IYbJwjBUR0sRdmuP15Ng== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LftVF4K0JzT13; Sat, 9 Jul 2022 01:53:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2691rvWL041017; Sat, 9 Jul 2022 01:53:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2691rvcV041016; Sat, 9 Jul 2022 01:53:57 GMT (envelope-from git) Date: Sat, 9 Jul 2022 01:53:57 GMT Message-Id: <202207090153.2691rvcV041016@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 5b2cbb7be292 - main - editors/vscode: fix build with ${LOCALBASE}/share/.yarnrc existing List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b2cbb7be2922fb35dd827a4a17ab1c04c23db58 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657331637; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N6PaQwtDZr1m4ffR9Q0Kq2KAR3FJ8YQMgURCBqVVqds=; b=dGtUQFmbDmaNGHQk8zilyZein1UMkswPBkmri5UanMzGxXRO3Bybx1PCWoha/bYwJK9dmZ s7hRlFKII/9WliGa4CMkOba/NO1HJR/vK9w83IE5fx+rbbhttvi7nE34x1GH7QPNPaRkO5 lHkk0OUZ5VXd8f1IUcNUYsaBNFl9/MVUX3bCImm90ngNmk6AstBF66zluTiFjUptx5B9J5 vNyODfG2TJSfB2pQmv+wpVEs+D8xm9Rn+o8wiXlDc6vu4zxCrx/dBQydhVj/Ng/suoOhIs 5M3fkM2DKC6+HKxW63y9+fBN7Beh3B53ljghK0nCgUrnlNZDw678/pyXeUEHWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657331637; a=rsa-sha256; cv=none; b=bAe00yDuC55K4KqS4GPDaH72yGRiJdqhvMj9ggnU+gebRS82Zd/QstlNvVH1rotkcqgGgU nmAbERYlxKGLOwlLQpxT1hnqINJe9A8ggNvDBxX2l9HpZj1fqyFlv1UDRR4yQDbrlb0TQD UiyTfawix1XbHIs8T2owytmlKMiekdwgIEmqC4d7hTGBzpqWEJnpImzpmPY519p/6bwNPA hneAm8MxfrnpbomBhLtkbkiqjoyP0BE3ykUQr/2ALFGL+S7vpbvDj0/dX4g5mbBUXlR/BX njSS0lPcDPGgYMjvWP4zp54V8yjoDD9OhWIr+YTGjEqiA7/JaF9qRzFA1nNKnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b2cbb7be2922fb35dd827a4a17ab1c04c23db58 commit 5b2cbb7be2922fb35dd827a4a17ab1c04c23db58 Author: Stefan Eßer AuthorDate: 2022-07-09 01:51:16 +0000 Commit: Hiroki Tagato CommitDate: 2022-07-09 01:51:16 +0000 editors/vscode: fix build with ${LOCALBASE}/share/.yarnrc existing PR: 242936 Reported by: bourne.identity@hotmail.com, jacques+freebsdbugzilla@foucry.net, meta --- editors/vscode/files/patch-build_npm_postinstall.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/editors/vscode/files/patch-build_npm_postinstall.js b/editors/vscode/files/patch-build_npm_postinstall.js index 9013734a9ffb..44581f460354 100644 --- a/editors/vscode/files/patch-build_npm_postinstall.js +++ b/editors/vscode/files/patch-build_npm_postinstall.js @@ -1,12 +1,13 @@ --- build/npm/postinstall.js.orig 2022-06-08 11:20:55 UTC +++ build/npm/postinstall.js -@@ -20,7 +20,8 @@ function yarnInstall(location, opts) { +@@ -20,7 +20,9 @@ function yarnInstall(location, opts) { const raw = process.env['npm_config_argv'] || '{}'; const argv = JSON.parse(raw); const original = argv.original || []; - const args = original.filter(arg => arg === '--ignore-optional' || arg === '--frozen-lockfile' || arg === '--check-files'); + const passargs = ['--ignore-optional', '--frozen-lockfile', '--check-files', '--offline', '--no-progress', '--verbose']; + const args = original.filter(arg => passargs.includes(arg)); ++ args.push('--use-yarnrc=' + process.env.PWD + '/.yarnrc'); if (opts.ignoreEngines) { args.push('--ignore-engines'); delete opts.ignoreEngines;