Issue 6909 - Make ensure_dependencies.py call "npm install" for non-repositories

ensure_dependencies.py

 #!/usr/bin/env python
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import sys
 import os
 import posixpath
 import re
@@ skipping 334 matching lines @@
             resolved_revision = repo_types[type].get_revision_id(target, revision)
             if not resolved_revision:
                 raise Exception('Failed to resolve revision %s' % revision)
 
         logging.info('Updating repository %s to revision %s' % (target, resolved_revision))
         repo_types[type].update(target, resolved_revision, revision)
         return True
     return False
 
 
-def resolve_deps(repodir, repotype, level=0, self_update=True, overrideroots=None, skipdependencies=set()):

[tlucas, 2018/08/29 21:19:14]

Nit: please break after 79, when touching this anyway.

[Sebastian Noack, 2018/08/30 00:42:33]

Done.

+def resolve_deps(repodir, repotype, level=0, self_update=True,
+                 overrideroots=None, skipdependencies=set()):
     config = read_deps(repodir)
     if config is None:
         if level == 0:
             logging.warning('No dependencies file in directory %s, nothing to do...\n%s' % (repodir, USAGE))
         return
     if level >= 10:
         logging.warning('Too much subrepository nesting, ignoring %s' % repo)
         return
 
     if overrideroots is not None:
@@ skipping 17 matching lines @@
             logging.warning('No valid source / revision found to create %s' % target)
             continue
 
         repo_cloned = ensure_repo(repodir, parenttype, target, vcs,
                                   _root.get(vcs, ''), source)
         if repo_types[vcs].istype(target):
             repo_updated = update_repo(target, vcs, rev)
             npm_outdated = repo_cloned or repo_updated
         else:
             vcs = None
-            npm_outdated = not os.path.exists(os.path.join(target, 'node_modules'))

[tlucas, 2018/08/29 21:19:14]

Nit: Please break after 79 characters.

[Sebastian Noack, 2018/08/30 00:42:33]

Done.

+            npm_outdated = not os.path.exists(
+                os.path.join(target, 'node_modules')
+            )
 
         recent_npm_failed = os.path.exists(os.path.join(target, NPM_LOCKFILE))
         if npm_outdated or recent_npm_failed:
             resolve_npm_dependencies(target, vcs)
 
         resolve_deps(target, vcs, level + 1, self_update=False,
                      overrideroots=overrideroots, skipdependencies=skipdependencies)
 
     if self_update and '_self' in config and '*' in config['_self']:
         source = safe_join(repodir, config['_self']['*'])
@@ skipping 42 matching lines @@
     args = parser.parse_args()
 
     if args.quiet:
         logging.disable(logging.INFO)
 
     repos = args.repos
     if not len(repos):
         repos = [os.path.dirname(__file__)]
     for repo in repos:
         resolve_deps(repo, get_repo_type(repo))