diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-03-07 17:27:35 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-07 17:19:40 +0000 |
commit | 66a9ee7d54ca9c25209f72da079f260ccdcc872a (patch) | |
tree | b6fff4bba2113706e23e77b022e4391e7cfe5938 /lib/bb/fetch2 | |
parent | 19507b80f35d37dc4b1614bd390b8e261dd4a2bd (diff) | |
download | openembedded-core-contrib-66a9ee7d54ca9c25209f72da079f260ccdcc872a.tar.gz |
fetch2/npm: fix indentation
No code changes, just fix to use four spaces.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/fetch2')
-rw-r--r-- | lib/bb/fetch2/npm.py | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/lib/bb/fetch2/npm.py b/lib/bb/fetch2/npm.py index f99b308340..59312f4f01 100644 --- a/lib/bb/fetch2/npm.py +++ b/lib/bb/fetch2/npm.py @@ -57,10 +57,10 @@ class Npm(FetchMethod): logger.debug(1, "NpmFetch: %s", msg) def clean(self, ud, d): - logger.debug(2, "Calling cleanup %s" % ud.pkgname) - bb.utils.remove(ud.localpath, False) - bb.utils.remove(ud.pkgdatadir, True) - bb.utils.remove(ud.fullmirror, False) + logger.debug(2, "Calling cleanup %s" % ud.pkgname) + bb.utils.remove(ud.localpath, False) + bb.utils.remove(ud.pkgdatadir, True) + bb.utils.remove(ud.fullmirror, False) def urldata_init(self, ud, d): """ @@ -105,32 +105,32 @@ class Npm(FetchMethod): runfetchcmd(command, d, quiet) def _unpackdep(self, ud, pkg, data, destdir, dldir, d): - file = data[pkg]['tgz'] - logger.debug(2, "file to extract is %s" % file) - if file.endswith('.tgz') or file.endswith('.tar.gz') or file.endswith('.tar.Z'): + file = data[pkg]['tgz'] + logger.debug(2, "file to extract is %s" % file) + if file.endswith('.tgz') or file.endswith('.tar.gz') or file.endswith('.tar.Z'): cmd = 'tar xz --strip 1 --no-same-owner -f %s/%s' % (dldir, file) - else: + else: bb.fatal("NPM package %s downloaded not a tarball!" % file) - # Change to subdir before executing command - save_cwd = os.getcwd() - if not os.path.exists(destdir): - os.makedirs(destdir) - os.chdir(destdir) - path = d.getVar('PATH', True) - if path: + # Change to subdir before executing command + save_cwd = os.getcwd() + if not os.path.exists(destdir): + os.makedirs(destdir) + os.chdir(destdir) + path = d.getVar('PATH', True) + if path: cmd = "PATH=\"%s\" %s" % (path, cmd) - bb.note("Unpacking %s to %s/" % (file, os.getcwd())) - ret = subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True) - os.chdir(save_cwd) + bb.note("Unpacking %s to %s/" % (file, os.getcwd())) + ret = subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True) + os.chdir(save_cwd) - if ret != 0: + if ret != 0: raise UnpackError("Unpack command %s failed with return value %s" % (cmd, ret), ud.url) - if 'deps' not in data[pkg]: + if 'deps' not in data[pkg]: return - for dep in data[pkg]['deps']: - self._unpackdep(ud, dep, data[pkg]['deps'], "%s/node_modules/%s" % (destdir, dep), dldir, d) + for dep in data[pkg]['deps']: + self._unpackdep(ud, dep, data[pkg]['deps'], "%s/node_modules/%s" % (destdir, dep), dldir, d) def unpack(self, ud, destdir, d): |