[Pkg-javascript-commits] [node-yarnpkg] 12/13: Patch away is-ci (not packaged yet in Debian)

Paolo Greppi paolog-guest at moszumanska.debian.org
Sat Dec 24 14:36:19 UTC 2016


This is an automated email from the git hooks/post-receive script.

paolog-guest pushed a commit to branch master
in repository node-yarnpkg.

commit eb2f751860b584ff72c6ffee27e343651f87f43a
Author: Paolo Greppi <paolo.greppi at libpf.com>
Date:   Sat Dec 24 14:19:39 2016 +0000

    Patch away is-ci (not packaged yet in Debian)
---
 debian/control               |  1 -
 debian/patches/02-is-ci.diff | 48 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 3786c25..bb3f44d 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,6 @@ Depends:
  , node-inquirer (>= 1.2.2)
  , node-invariant (>= 2.2.0)
  , node-is-builtin-module (>= 1.0.0)
- , node-is-ci (>= 1.0.10)
  , node-leven (>= 2.0.0)
  , node-loud-rejection (>= 1.2.0)
  , node-minimatch (>= 3.0.3)
diff --git a/debian/patches/02-is-ci.diff b/debian/patches/02-is-ci.diff
new file mode 100644
index 0000000..a2f98f9
--- /dev/null
+++ b/debian/patches/02-is-ci.diff
@@ -0,0 +1,48 @@
+Description: Patch away is-ci (not packaged yet in Debian).
+Forwarded: not-needed
+Author: Paolo Greppi <paolo.greppi at libpf.com>
+
+Index: node-yarnpkg/src/cli/commands/install.js
+===================================================================
+--- node-yarnpkg.orig/src/cli/commands/install.js
++++ node-yarnpkg/src/cli/commands/install.js
+@@ -27,7 +27,6 @@ import {sortAlpha} from '../../util/misc
+ const invariant = require('invariant');
+ const semver = require('semver');
+ const emoji = require('node-emoji');
+-const isCI = require('is-ci');
+ const path = require('path');
+ 
+ const {version: YARN_VERSION, installationMethod: YARN_INSTALL_METHOD} = require('../../../package.json');
+@@ -725,8 +724,8 @@ export class Install {
+    */
+ 
+   checkUpdate() {
+-    if (!process.stdout.isTTY || isCI) {
+-      // don't show upgrade dialog on CI or non-TTY terminals
++    if (!process.stdout.isTTY) {
++      // don't show upgrade dialog on non-TTY terminals
+       return;
+     }
+ 
+Index: node-yarnpkg/src/reporters/base-reporter.js
+===================================================================
+--- node-yarnpkg.orig/src/reporters/base-reporter.js
++++ node-yarnpkg/src/reporters/base-reporter.js
+@@ -15,7 +15,6 @@ import type {LanguageKeys} from './lang/
+ import type {Formatter} from './format.js';
+ import {defaultFormatter} from './format.js';
+ import * as languages from './lang/index.js';
+-import isCI from 'is-ci';
+ 
+ const util = require('util');
+ 
+@@ -54,7 +53,7 @@ export default class BaseReporter {
+     this.stderr = opts.stderr || process.stderr;
+     this.stdin = opts.stdin || process.stdin;
+     this.emoji = !!opts.emoji;
+-    this.noProgress = !!opts.noProgress || isCI;
++    this.noProgress = !!opts.noProgress;
+     this.isVerbose = !!opts.verbose;
+ 
+     // $FlowFixMe: this is valid!
diff --git a/debian/patches/series b/debian/patches/series
index b755857..36ac9ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 00-nodejs.diff
 01-cmd-shim.diff
+02-is-ci.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-yarnpkg.git



More information about the Pkg-javascript-commits mailing list