[Pkg-javascript-commits] [node-bluebird] 05/15: Update fix_root_dir.patch to ignore "root dir" error instead

[Ross Gammon]

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

ross-guest pushed a commit to branch master
in repository node-bluebird.

commit ba653a374b88680d1e293726e2e59dc0dc4674f1
Author: Ross Gammon <rosco2 at ubuntu.com>
Date:   Sat Dec 3 15:59:55 2016 +0100

    Update fix_root_dir.patch to ignore "root dir" error instead
    
    Bluebird is not expecting the current directory to be "node-bluebird-3.4.6".
    It is expecting "bluebird".
---
 debian/patches/fix_root_dir.patch | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/patches/fix_root_dir.patch b/debian/patches/fix_root_dir.patch
index ccbe72d..dcf74f0 100644
--- a/debian/patches/fix_root_dir.patch
+++ b/debian/patches/fix_root_dir.patch
@@ -1,15 +1,22 @@
-Description: Set the root directory to node-bluebird for test/build.js
+Description: Avoid error for incorrect root directory
+ Avoid error for incorrect root directory to node-bluebird
+ for test/build.js. When building in Debian, the route directory
+ changes (e.g. node-bluebird-3.4.6). This should not matter for
+ Debian, the check is probably just in case a developer tries to
+ run the tests outside of the root directory.
 Author: Ross Gammon <rossgammon at mail.dk>
 Forwarded: not-needed
 
 --- node-bluebird.orig/tools/build.js
 +++ node-bluebird/tools/build.js
-@@ -254,7 +254,7 @@
+@@ -254,8 +254,8 @@
  
  var root = process.cwd();
  // Since rm -rf is called, better be sure...
 -if (path.basename(root).toLowerCase() !== "bluebird") {
+-    throw new Error("cwd must be se to bluebird project root. Cwd is currently\n\n" +
 +if (path.basename(root).toLowerCase() !== "node-bluebird") {
-     throw new Error("cwd must be se to bluebird project root. Cwd is currently\n\n" +
++    console.log("cwd should be set to bluebird project root. Cwd is currently\n\n" +
          "         " + process.cwd() + "\n");
  }
+ var dirs = {

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