Author: glen Date: Sun Jun 17 20:19:04 2012 GMT Module: packages Tag: HEAD ---- Log message: - patch: make 'npm link' search for global installs from node's globalPaths for arch specific installs (/usr/lib64/node, /usr/lib/node) - rel 3
---- Files affected: packages/npm: npm.spec (1.12 -> 1.13) , link-globalPaths.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/npm/npm.spec diff -u packages/npm/npm.spec:1.12 packages/npm/npm.spec:1.13 --- packages/npm/npm.spec:1.12 Sat Jun 16 13:49:26 2012 +++ packages/npm/npm.spec Sun Jun 17 22:18:59 2012 @@ -6,12 +6,13 @@ Summary: A package manager for node.js Name: npm Version: 1.1.19 -Release: 2 +Release: 3 License: MIT License Group: Development/Libraries URL: http://npmjs.org/ Source0: http://registry.npmjs.org/npm/-/%{name}-%{version}.tgz # Source0-md5: 1838db326e36430b7cf78f0c5aa77636 +Patch0: link-globalPaths.patch BuildRequires: bash BuildRequires: nodejs >= 0.6 BuildRequires: rpmbuild(macros) >= 1.634 @@ -70,6 +71,7 @@ %prep %setup -qc mv package/* . +%patch0 -p1 # fix shebangs %{__sed} -i -e '1s,^#!.*node,#!/usr/bin/node,' \ @@ -169,6 +171,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.13 2012/06/17 20:18:59 glen +- patch: make 'npm link' search for global installs from node's globalPaths for + arch specific installs (/usr/lib64/node, /usr/lib/node) +- rel 3 + Revision 1.12 2012/06/16 11:49:26 glen - fix /etc/npmrc reading (package npmrc also in package dir) ================================================================ Index: packages/npm/link-globalPaths.patch diff -u /dev/null packages/npm/link-globalPaths.patch:1.1 --- /dev/null Sun Jun 17 22:19:04 2012 +++ packages/npm/link-globalPaths.patch Sun Jun 17 22:18:59 2012 @@ -0,0 +1,38 @@ +--- npm-1.1.19/lib/link.js~ 2012-03-28 06:25:48.000000000 +0300 ++++ npm-1.1.19/lib/link.js 2012-06-17 23:14:39.410104873 +0300 +@@ -12,6 +12,7 @@ + , relativize = require("./utils/relativize.js") + , rm = require("rimraf") + , output = require("./utils/output.js") ++ , globalPaths = require('module').globalPaths + , build = require("./build.js") + + module.exports = link +@@ -76,11 +94,24 @@ + }) + } + +- fs.lstat(pp, function (er, st) { +- if (er) { ++ // find pp from globalPaths ++ asyncMap(globalPaths, function(f, cb) { ++ f = path.resolve(f, pkg) ++ fs.lstat(f, function(er, st) { ++ if (er) { ++ cb() ++ } else { ++ cb(null, f, st) ++ } ++ }); ++ }, function(er, f, st) { ++ pp = f && f[0] || path.resolve(npm.globalDir, pkg) ++ ++ if (er) return cb() ++ if (!f || !f[0]) { + rp = pp + return npm.commands.install(t, pkg, n) +- } else if (!st.isSymbolicLink()) { ++ } else if (!st[0].isSymbolicLink()) { + rp = pp + next() + } else { ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/npm/npm.spec?r1=1.12&r2=1.13 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
