diff options
author | Kat Marchán <kzm@sykosomatic.org> | 2017-06-08 03:59:53 +0300 |
---|---|---|
committer | Kat Marchán <kzm@sykosomatic.org> | 2017-06-08 03:59:53 +0300 |
commit | 2d9629bb2043cff47eaad2654a64d2cef5725356 (patch) | |
tree | 4c9713ee5e17fb14ebbd1229790df37e4603c34e | |
parent | e7e8ee5c57c7238655677e118a8809b652019f53 (diff) |
pacote: pull in new version with better git logging
-rw-r--r-- | node_modules/pacote/CHANGELOG.md | 10 | ||||
-rw-r--r-- | node_modules/pacote/lib/util/git.js | 7 | ||||
-rw-r--r-- | node_modules/pacote/package.json | 20 | ||||
-rw-r--r-- | package-lock.json | 6 | ||||
-rw-r--r-- | package.json | 2 |
5 files changed, 30 insertions, 15 deletions
diff --git a/node_modules/pacote/CHANGELOG.md b/node_modules/pacote/CHANGELOG.md index e176199c9..882017226 100644 --- a/node_modules/pacote/CHANGELOG.md +++ b/node_modules/pacote/CHANGELOG.md @@ -2,6 +2,16 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +<a name="2.7.33"></a> +## [2.7.33](https://github.com/zkat/pacote/compare/v2.7.32...v2.7.33) (2017-06-08) + + +### Bug Fixes + +* **git:** better error reporting when ls-remote fails ([10aae8f](https://github.com/zkat/pacote/commit/10aae8f)) + + + <a name="2.7.32"></a> ## [2.7.32](https://github.com/zkat/pacote/compare/v2.7.31...v2.7.32) (2017-06-07) diff --git a/node_modules/pacote/lib/util/git.js b/node_modules/pacote/lib/util/git.js index fc3d158fa..ed1b49d56 100644 --- a/node_modules/pacote/lib/util/git.js +++ b/node_modules/pacote/lib/util/git.js @@ -109,8 +109,13 @@ function revs (repo, opts) { env: gitEnv() }, opts).then(child => { let stdout = '' + let stderr = '' child.stdout.on('data', d => { stdout += d }) - return finished(child).then(() => { + child.stderr.on('data', d => { stderr += d }) + return finished(child).catch(err => { + err.message = `Error while executing:\n${GITPATH} ls-remote -h -t ${repo}\n\n${stderr}\n${err.message}` + throw err + }).then(() => { return stdout.split('\n').reduce((revs, line) => { const split = line.split(/\s+/, 2) if (split.length < 2) { return revs } diff --git a/node_modules/pacote/package.json b/node_modules/pacote/package.json index 611c809c7..15d926187 100644 --- a/node_modules/pacote/package.json +++ b/node_modules/pacote/package.json @@ -1,8 +1,8 @@ { - "_from": "pacote@2.7.32", - "_id": "pacote@2.7.32", + "_from": "pacote@2.7.33", + "_id": "pacote@2.7.33", "_inBundle": false, - "_integrity": "sha512-LaNJsAs8Yd7i8z8kMAfU+D63HCWRbGhrgnR8oSfngoCzW+mNybZvnUYNUcDt7iCQOw+zXmYC7uqucNxZjxzONw==", + "_integrity": "sha512-CvPBNmLl+wFJzZ74GTf7y6PO0RC49Ht6iah+fY7Qk/6t+Y3HMoi1XZcKfPk46We9oUFiA5zQTzRazvdaiU8rAQ==", "_location": "/pacote", "_phantomChildren": { "cacache": "9.2.8", @@ -21,20 +21,20 @@ "_requested": { "type": "version", "registry": true, - "raw": "pacote@2.7.32", + "raw": "pacote@2.7.33", "name": "pacote", "escapedName": "pacote", - "rawSpec": "2.7.32", + "rawSpec": "2.7.33", "saveSpec": null, - "fetchSpec": "2.7.32" + "fetchSpec": "2.7.33" }, "_requiredBy": [ "#USER", "/" ], - "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.32.tgz", - "_shasum": "6affb8fc98037fe3f91440cd73f0c2e6e7b93e2d", - "_spec": "pacote@2.7.32", + "_resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.33.tgz", + "_shasum": "4a316d7c369fa6eed679a323ac2a98eec129e250", + "_spec": "pacote@2.7.33", "_where": "/Users/zkat/Documents/code/npm", "author": { "name": "Kat Marchán", @@ -120,5 +120,5 @@ "update-coc": "weallbehave -o . && git add CODE_OF_CONDUCT.md && git commit -m 'docs(coc): updated CODE_OF_CONDUCT.md'", "update-contrib": "weallcontribute -o . && git add CONTRIBUTING.md && git commit -m 'docs(contributing): updated CONTRIBUTING.md'" }, - "version": "2.7.32" + "version": "2.7.33" } diff --git a/package-lock.json b/package-lock.json index 624b69593..6802c081e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1300,9 +1300,9 @@ } }, "pacote": { - "version": "2.7.32", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.32.tgz", - "integrity": "sha512-LaNJsAs8Yd7i8z8kMAfU+D63HCWRbGhrgnR8oSfngoCzW+mNybZvnUYNUcDt7iCQOw+zXmYC7uqucNxZjxzONw==", + "version": "2.7.33", + "resolved": "https://registry.npmjs.org/pacote/-/pacote-2.7.33.tgz", + "integrity": "sha512-CvPBNmLl+wFJzZ74GTf7y6PO0RC49Ht6iah+fY7Qk/6t+Y3HMoi1XZcKfPk46We9oUFiA5zQTzRazvdaiU8rAQ==", "dependencies": { "make-fetch-happen": { "version": "2.4.12", diff --git a/package.json b/package.json index 7b183d3d9..197037b0c 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "once": "~1.4.0", "opener": "~1.4.3", "osenv": "~0.1.4", - "pacote": "~2.7.32", + "pacote": "~2.7.33", "path-is-inside": "~1.0.2", "promise-inflight": "~1.0.1", "read": "~1.0.7", |