[Pkg-javascript-commits] [node-bluebird] 01/03: Improve fix-root-fix.patch to match the Debian build directory

[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 a6354b1da3ac67adc52db9a23cb4e7713af621a1
Author: Ross Gammon <rosco2 at ubuntu.com>
Date:   Sat Dec 17 19:24:52 2016 +0100

    Improve fix-root-fix.patch to match the Debian build directory
---
 debian/patches/fix_root_dir.patch | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/debian/patches/fix_root_dir.patch b/debian/patches/fix_root_dir.patch
index dcf74f0..5b44ab0 100644
--- a/debian/patches/fix_root_dir.patch
+++ b/debian/patches/fix_root_dir.patch
@@ -1,9 +1,11 @@
 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.
+ Avoid error for incorrect root directory. Test/build.js expects
+ "bluebird". When building in Debian, the route 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
+ at least the first 13 characters of the root directory contain
+ "node-bluebird".
 Author: Ross Gammon <rossgammon at mail.dk>
 Forwarded: not-needed
 
@@ -15,8 +17,8 @@ Forwarded: not-needed
  // 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") {
-+    console.log("cwd should be set to bluebird project root. Cwd is currently\n\n" +
++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" +
          "         " + process.cwd() + "\n");
  }
  var dirs = {

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