[Pkg-javascript-commits] [node-concat-stream] 04/06: Fix patch after testing

[Ross Gammon]

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

ross-guest pushed a commit to branch stretch
in repository node-concat-stream.

commit 8d05b8232c1ded774c8fed1bec226e0ebb556516
Author: Ross Gammon <rosco2 at ubuntu.com>
Date:   Sun May 28 19:02:12 2017 +0200

    Fix patch after testing
---
 debian/patches/to-string_numbers.patch | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/debian/patches/to-string_numbers.patch b/debian/patches/to-string_numbers.patch
index 39a1051..ef7bb9a 100644
--- a/debian/patches/to-string_numbers.patch
+++ b/debian/patches/to-string_numbers.patch
@@ -13,11 +13,9 @@ Applied-Upstream: https://github.com/maxogden/concat-stream/pull/47/commits/3e28
 Last-Update: 2017-05-28
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/index.js b/index.js
-index d20f954..b16ad13 100644
---- a/index.js
-+++ b/index.js
-@@ -73,6 +73,10 @@ function isArrayish (arr) {
+--- node-concat-stream.orig/index.js
++++ node-concat-stream/index.js
+@@ -73,6 +73,10 @@
    return /Array\]$/.test(Object.prototype.toString.call(arr))
  }
  
@@ -28,38 +26,36 @@ index d20f954..b16ad13 100644
  function stringConcat (parts) {
    var strings = []
    var needsToString = false
-@@ -82,8 +86,10 @@ function stringConcat (parts) {
+@@ -82,8 +86,10 @@
        strings.push(p)
      } else if (Buffer.isBuffer(p)) {
        strings.push(p)
 -    } else {
 +    } else if (isBufferish(p)) {
-       strings.push(new Buffer(p))
+       strings.push(Buffer(p))
 +    } else {
-+      strings.push(new Buffer(String(p)))
++      strings.push(Buffer(String(p)))
      }
    }
    if (Buffer.isBuffer(parts[0])) {
-@@ -101,10 +107,11 @@ function bufferConcat (parts) {
+@@ -101,10 +107,11 @@
      var p = parts[i]
      if (Buffer.isBuffer(p)) {
        bufs.push(p)
 -    } else if (typeof p === 'string' || isArrayish(p)
 -    || (p && typeof p.subarray === 'function')) {
 +    } else if (isBufferish(p)) {
-       bufs.push(new Buffer(p))
--    } else bufs.push(new Buffer(String(p)))
+       bufs.push(Buffer(p))
+-    } else bufs.push(Buffer(String(p)))
 +    } else {
-+      bufs.push(new Buffer(String(p)))
++      bufs.push(Buffer(String(p)))
 +    }
    }
    return Buffer.concat(bufs)
  }
-diff --git a/test/string.js b/test/string.js
-index 145630c..be60998 100644
---- a/test/string.js
-+++ b/test/string.js
-@@ -58,7 +58,7 @@ test('string from buffers with multibyte characters', function (t) {
+--- node-concat-stream.orig/test/string.js
++++ node-concat-stream/test/string.js
+@@ -58,7 +58,7 @@
    var snowman = new Buffer('☃')
    for (var i = 0; i < 8; i++) {
      strings.write(snowman.slice(0, 1))
@@ -68,7 +64,7 @@ index 145630c..be60998 100644
    }
    strings.end()
  })
-@@ -74,3 +74,14 @@ test('string infer encoding with empty string chunk', function (t) {
+@@ -74,3 +74,14 @@
    strings.write("dogs")
    strings.end()
  })

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