bug 1195365 more rework to add site directories instead of plain path modifications r?
MozReview-Commit-ID: 3ptpsB6NT9M
--- a/scripts/updates/balrog-release-pusher.py
+++ b/scripts/updates/balrog-release-pusher.py
@@ -4,21 +4,22 @@ try:
except ImportError:
import json
import os
from os import path
import re
import logging
import sys
+import site
# Use explicit version of python-requests
sys.path.insert(0, path.join(path.dirname(__file__),
"../../lib/python/vendor/requests-2.7.0"))
-sys.path.insert(0, path.join(path.dirname(__file__), "../../lib/python"))
+site.addsitedir(os.path.join(os.path.dirname(__file__), "../../lib/python"))
from balrog.submitter.cli import ReleaseCreatorV3, ReleaseCreatorV4, \
ReleasePusher
from release.info import readReleaseConfig
from util.retry import retry
from util.hg import mercurial, make_hg_url
HG = "hg.mozilla.org"
--- a/scripts/updates/balrog-release-shipper.py
+++ b/scripts/updates/balrog-release-shipper.py
@@ -3,21 +3,22 @@ try:
import simplejson as json
except ImportError:
import json
import os
from os import path
import logging
import sys
+import site
# Use explicit version of python-requests
sys.path.insert(0, path.join(path.dirname(__file__),
"../../lib/python/vendor/requests-2.7.0"))
-sys.path.insert(0, path.join(path.dirname(__file__), "../../lib/python"))
+site.addsitedir(os.path.join(os.path.dirname(__file__), "../../lib/python"))
from balrog.submitter.cli import ReleasePusher
from release.info import readReleaseConfig
from util.retry import retry
from util.hg import mercurial, make_hg_url
HG = "hg.mozilla.org"
DEFAULT_BUILDBOT_CONFIGS_REPO = make_hg_url(HG, 'build/buildbot-configs')
--- a/scripts/updates/balrog-submitter.py
+++ b/scripts/updates/balrog-submitter.py
@@ -1,20 +1,22 @@
#!/usr/bin/env python
import json
import os
import logging
import sys
+import site
# Use explicit version of python-requests
sys.path.insert(0, os.path.join(os.path.dirname(__file__),
"../../lib/python/vendor/requests-2.7.0"))
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../lib/python"))
+site.addsitedir(os.path.join(os.path.dirname(__file__), "../../lib/python"))
+
from balrog.submitter.cli import NightlySubmitterV3, ReleaseSubmitterV3, \
NightlySubmitterV4, ReleaseSubmitterV4
if __name__ == '__main__':
from optparse import OptionParser
parser = OptionParser()
--- a/scripts/updates/balrog-tweaker.py
+++ b/scripts/updates/balrog-tweaker.py
@@ -1,20 +1,20 @@
#!/usr/bin/env python
import json
import os
import logging
import sys
-
+import site
# Use explicit version of python-requests
sys.path.insert(0, os.path.join(os.path.dirname(__file__),
"../../lib/python/vendor/requests-2.7.0"))
-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../../lib/python"))
+site.addsitedir(os.path.join(os.path.dirname(__file__), "../../lib/python"))
from balrog.submitter.cli import BlobTweaker
if __name__ == '__main__':
from optparse import OptionParser
parser = OptionParser()
parser.add_option("-j", "--json", dest="blob_data")
parser.add_option("-b", "--blobname", dest="blob_name")