Bug 1317593 - Fix logic in settings vcs_share_base r=gps a=release
authorRail Aliiev <rail@mozilla.com>
Tue, 15 Nov 2016 06:17:51 +0100
changeset 352442 04cf8fc99ad61779d537ece9c935d2f1bcebbbce
parent 352441 3d28fa9f98e1eafc400662d32823cc3594627496
child 352443 0e55c3f00cdcf981527d62ca5bd14f8072017254
push id6795
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 14:19:46 +0000
treeherdermozilla-esr52@76101b503191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, release
bugs1317593
milestone52.0a2
Bug 1317593 - Fix logic in settings vcs_share_base r=gps a=release MozReview-Commit-ID: 7GVvOjNESqZ
testing/mozharness/mozharness/base/vcs/mercurial.py
--- a/testing/mozharness/mozharness/base/vcs/mercurial.py
+++ b/testing/mozharness/mozharness/base/vcs/mercurial.py
@@ -348,17 +348,17 @@ class MercurialVCS(ScriptMixin, LogMixin
         # self.vcs_config instead of passing arguments. This confuses
         # scripts that have multiple repos. This includes the clone_tools()
         # step :(
 
         if not rev and not branch:
             self.warning('did not specify revision or branch; assuming "default"')
             branch = 'default'
 
-        share_base = c.get('vcs_share_base', os.environ.get('HG_SHARE_BASE_DIR', None))
+        share_base = c.get('vcs_share_base') or os.environ.get('HG_SHARE_BASE_DIR')
         if share_base and c.get('use_vcs_unique_share'):
             # Bug 1277041 - update migration scripts to support robustcheckout
             # fake a share but don't really share
             share_base = os.path.join(share_base, hashlib.md5(dest).hexdigest())
 
         # We require shared storage is configured because it guarantees we
         # only have 1 local copy of logical repo stores.
         if not share_base: