Bug 1317593 - Fix logic in settings vcs_share_base r=gps draft
authorRail Aliiev <rail@mozilla.com>
Tue, 15 Nov 2016 06:17:51 +0100
changeset 438906 283654f69f5992f34b5431ed9ad7c25c3724951d
parent 438905 bc4ca02773a468d8a52b2b1218e8e27f69749b25
child 537010 dd92c855488f9deac4dc6d19ad34e62613414bce
push id35838
push userbmo:rail@mozilla.com
push dateTue, 15 Nov 2016 05:18:36 +0000
reviewersgps
bugs1317593
milestone53.0a1
Bug 1317593 - Fix logic in settings vcs_share_base r=gps 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: