summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2015-08-19 11:44:50 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2015-09-13 23:40:52 +0200
commit42e5a7088585c15d230a8f367e762a5815364ed8 (patch)
treee3dab70e1b8c03c8b2fb804971598221b45dbc06 /devel
parent2af997bba7419a31835c4a70aed812726a5d2434 (diff)
git-tracker: read INPUT_HTTP[S]_PROXY environment variable
This allows using a different HTTP[S] proxy for input and output trees, if necessary. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'devel')
-rwxr-xr-xdevel/git-tracker.py22
1 files changed, 16 insertions, 6 deletions
diff --git a/devel/git-tracker.py b/devel/git-tracker.py
index df95fe0a..766267df 100755
--- a/devel/git-tracker.py
+++ b/devel/git-tracker.py
@@ -37,13 +37,22 @@ FAIL = 'failed'
SCRIPT_GIT_NAME = 'backports git tracker'
SCRIPT_GIT_EMAIL = ''
+def make_proxy_env(input):
+ env = os.environ.copy()
+ if input:
+ if 'INPUT_HTTP_PROXY' in env:
+ env['http_proxy'] = env['INPUT_HTTP_PROXY']
+ if 'INPUT_HTTPS_PROXY' in env:
+ env['https_proxy'] = env['INPUT_HTTPS_PROXY']
+ return env
-def update_cache_objects(gittree, objdir):
+def update_cache_objects(gittree, objdir, input):
+ env = make_proxy_env(input)
if not os.path.isdir(objdir):
- git.clone(gittree, objdir, options=['--bare'])
+ git.clone(gittree, objdir, options=['--bare'], env=env)
else:
git.set_origin(gittree, objdir)
- git.remote_update(objdir)
+ git.remote_update(objdir, env=env)
def handle_commit(args, msg, branch, treename, kernelobjdir, tmpdir, wgitdir, backport_rev, kernel_rev,
prev_kernel_rev=None, defconfig=None, env={}, commit_failure=True,
@@ -175,11 +184,11 @@ if __name__ == '__main__':
defconfig = config.get(tree, 'defconfig')
branches = [r.strip() for r in config.get(tree, 'branches').split(',')]
- update_cache_objects(input, kernelobjdir)
+ update_cache_objects(input, kernelobjdir, input=True)
wgitref = os.path.join(cachedir, 'backport-' + tree)
- update_cache_objects(output, wgitref)
+ update_cache_objects(output, wgitref, input=False)
for branch in branches:
with tempdir.tempdir() as branch_tmpdir:
@@ -189,7 +198,8 @@ if __name__ == '__main__':
git.remove_config('core.bare', tree=wgitdir)
git.set_origin(output, wgitdir)
- kernel_head = git.ls_remote(branch, tree=kernelobjdir)
+ env = make_proxy_env(True)
+ kernel_head = git.ls_remote(branch, tree=kernelobjdir, env=env)
backport_author_env = {
'GIT_AUTHOR_NAME': SCRIPT_GIT_NAME,