Issue 2443 - Honour SKIP_DEPENDENCY_UPDATES environment variable

ensure_dependencies.py

 #!/usr/bin/env python
 # coding: utf-8
 
 # 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
@@ skipping 222 matching lines @@
 
   if type in revisions:
     revision = revisions[type]
   elif "*" in revisions:
     revision = revisions["*"]
   else:
     logging.warning("No revision specified for repository %s (type %s), skipping update" % (target, type))
     return
 
   resolved_revision = repo_types[type].get_revision_id(target, revision)
+  current_revision = repo_types[type].get_revision_id(target)
+
+  if (resolved_revision != current_revision and

[Sebastian Noack, 2015/05/07 13:17:19]

I think the code structure below below can be simplified like that:

  if resolved_revision != current_revision:
    if os.environ.get("SKIP_DEPENDENCY_UPDATES", ..
      logging.warning(..)
      return

    if not not resolved_revision:
      ..
  
    logging.info(..)
    repo_types[type].update(target, resolved_revision)

[kzar, 2015/05/07 13:44:29]

Done.

+      os.environ.get("SKIP_ENSURE_DEPENDENCIES", "").lower() not in ("", "0", "false")):

[Sebastian Noack, 2015/05/07 13:17:19]

We agreed on SKIP_DEPENDENCY_UPDATES rather than SKIP_ENSURE_DEPENDENCIES

[kzar, 2015/05/07 13:44:29]

Done.

+    logging.warning("SKIP_ENSURE_DEPENDENCIES environment variable set, "
+                    "%s not checked out to %s" % (target, revision))
+    return
+
   if not resolved_revision:
     logging.info("Revision %s is unknown, downloading remote changes" % revision)
     repo_types[type].pull(target)
     resolved_revision = repo_types[type].get_revision_id(target, revision)
     if not resolved_revision:
       raise Exception("Failed to resolve revision %s" % revision)
 
-  current_revision = repo_types[type].get_revision_id(target)
   if resolved_revision != current_revision:
     logging.info("Updating repository %s to revision %s" % (target, resolved_revision))
     repo_types[type].update(target, resolved_revision)
 
 def resolve_deps(repodir, 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
@@ skipping 56 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)