public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jesus Rivero" <neurogeek@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/neurogeek:master commit in: eclass/
Date: Fri, 23 Aug 2013 21:33:10 +0000 (UTC)	[thread overview]
Message-ID: <1377293555.a07b459620a4aa05b667fc2de0c6df13e1d4eb8c.neurogeek@gentoo> (raw)

commit:     a07b459620a4aa05b667fc2de0c6df13e1d4eb8c
Author:     Jesus Rivero <jesus.riveroa <AT> gmail <DOT> com>
AuthorDate: Fri Aug 23 21:32:35 2013 +0000
Commit:     Jesus Rivero <neurogeek <AT> gentoo <DOT> org>
CommitDate: Fri Aug 23 21:32:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/neurogeek.git;a=commit;h=a07b4596

Don't override NPM_MODULE if it was already defined

---
 eclass/npm.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/npm.eclass b/eclass/npm.eclass
index b6a2cde..e4a064e 100644
--- a/eclass/npm.eclass
+++ b/eclass/npm.eclass
@@ -24,13 +24,15 @@ inherit multilib
 # The Default value for NPM_MODULE is ${PN}
 #
 # Example: NPM_MODULE="${MY_PN}"
-NPM_MODULE="${PN}"
+if [[ -z $NPM_MODULE ]]; then
+	NPM_MODULE="${PN}"
+fi
 
 # @ECLASS-VARIABLE: NPM_FILES
 # @INTERNAL
 # @DESCRIPTION:
 # Files and directories that usually come in a standard NodeJS/npm module.
-NPM_FILES="index.js lib package.json ${PN}.js"
+NPM_FILES="index.js lib package.json ${NPM_MODULE}.js"
 
 # @ECLASS-VARIABLE: NPM_DOCS
 # @DESCRIPTION:


             reply	other threads:[~2013-08-23 21:33 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-23 21:33 Jesus Rivero [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-08-23 18:38 [gentoo-commits] dev/neurogeek:master commit in: eclass/ Jesus Rivero
2013-07-10 14:50 Jesus Rivero
2013-07-10 14:35 Jesus Rivero
2013-07-10 12:27 Jesus Rivero

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377293555.a07b459620a4aa05b667fc2de0c6df13e1d4eb8c.neurogeek@gentoo \
    --to=neurogeek@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox