[Pkg-javascript-commits] [node-bluebird] 03/17: update fix_root_dir patch to apply to new upstream source

Ross Gammon ross-guest at moszumanska.debian.org
Tue Oct 10 11:39:57 UTC 2017


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 66a0581862a20e089df5ddcdb360756f3a30d38b
Author: Hubert Chathi <hubert at muchlearning.org>
Date:   Sun Oct 1 12:20:47 2017 -0400

    update fix_root_dir patch to apply to new upstream source
    
    and fix a typo
---
 debian/patches/fix_root_dir.patch | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/debian/patches/fix_root_dir.patch b/debian/patches/fix_root_dir.patch
index 5b44ab0..7ed14f5 100644
--- a/debian/patches/fix_root_dir.patch
+++ b/debian/patches/fix_root_dir.patch
@@ -1,6 +1,6 @@
 Description: Avoid error for incorrect root directory
  Avoid error for incorrect root directory. Test/build.js expects
- "bluebird". When building in Debian, the route directory
+ "bluebird". When building in Debian, the root directory
  changes (e.g. node-bluebird-3.4.6). Altough 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), this patch checks that
@@ -11,14 +11,12 @@ Forwarded: not-needed
 
 --- node-bluebird.orig/tools/build.js
 +++ node-bluebird/tools/build.js
-@@ -254,8 +254,8 @@
- 
+@@ -254,7 +254,7 @@
+
  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().indexOf("bluebird") !== 0) {
 +if (path.basename(root).toLowerCase().substring(0, 13) !== "node-bluebird") {
-+    throw new Error("cwd must be set to bluebird project root. Cwd is currently\n\n" +
+     throw new Error("cwd must 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



More information about the Pkg-javascript-commits mailing list