<pre style='margin:0'>
Blair Zajac (blair) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/38d405b28ae379de73a03cbcb78704550df7ade0">https://github.com/macports/macports-ports/commit/38d405b28ae379de73a03cbcb78704550df7ade0</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 38d405b28ae npm7: new upstream 7.7.0 release
</span>38d405b28ae is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 38d405b28ae379de73a03cbcb78704550df7ade0
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Tue Mar 23 15:15:55 2021 -0700
<span style='display:block; white-space:pre;color:#404040;'> npm7: new upstream 7.7.0 release
</span>---
devel/npm7/Portfile | 10 +++++-----
devel/npm7/files/patch-lib-update.js.diff | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm7/Portfile b/devel/npm7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7081f361606..add0ea57197 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name npm7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.6.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.7.0
</span> revision 0
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +26,10 @@ distname npm-${version}
</span> extract.suffix .tgz
# Please keep the sha1 - users can use it to validate sha values published on npmjs.org for the package
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 29c048b8522fc846af1b66fbb8ce7f356584b121 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 98fdf139fa203f18eb3998b3a35c3f642503af3e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 071816fcbac7f58f42caa53b7ab5f0c214adbc3d41c33e21b4b35b99b4e692a7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3467767
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha1 bbcf8517a0e89ca1e48983af100a87e1d8ae71f4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 73b6060818fcb6ebee2cde7c35f0da647c3d9670 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fc1b7c938ab88dca633cc2769ad91849a485eb8769891cfd5624d89d7e0da125 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3462524
</span>
worksrcdir "package"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm7/files/patch-lib-update.js.diff b/devel/npm7/files/patch-lib-update.js.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e61ec7c906..402ca2afe4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm7/files/patch-lib-update.js.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm7/files/patch-lib-update.js.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,13 @@
</span> --- lib/update.js.orig 1985-10-26 01:15:00.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/update.js 2021-03-05 10:21:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -36,6 +36,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/update.js 2021-03-23 15:13:13.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,6 +44,21 @@
</span> ? global
: this.npm.prefix
+ // Prevent the npm package in global from updating. Prevent
+ // 'npm update -g' since it'll implicity upgrade npm and also
+ // prevent 'npm update -g npm'.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (npm.flatOptions.global) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (this.npm.config.get('global') {
</span> + if (!args.length || (args.length && args.find(e => e === 'npm'))) {
+ log.error('update', 'Ignoring attempt to update npm in ' + global);
+ log.error('update', 'which is part of the MacPorts npm7 base');
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,6 +19,6 @@
</span> + }
+ }
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (this.npm.flatOptions.depth) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (this.npm.config.get('depth')) {
</span> log.warn('update', 'The --depth option no longer has any effect. See RFC0019.\n' +
'https://github.com/npm/rfcs/blob/latest/implemented/0019-remove-update-depth-option.md')
</pre><pre style='margin:0'>
</pre>