Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Side by Side Diff: slave/run_slave.py

Issue 42843002: Add DBUS_SESSION_BUS_ADDRESS to allowed slave env vars. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """ Initialize the environment variables and start the buildbot slave. 6 """ Initialize the environment variables and start the buildbot slave.
7 """ 7 """
8 8
9 import os 9 import os
10 import shutil 10 import shutil
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 348
349 if sys.platform.startswith('win'): 349 if sys.platform.startswith('win'):
350 # list of all variables that we want to keep 350 # list of all variables that we want to keep
351 env_var = [ 351 env_var = [
352 'APPDATA', 352 'APPDATA',
353 'BUILDBOT_ARCHIVE_FORCE_SSH', 353 'BUILDBOT_ARCHIVE_FORCE_SSH',
354 'CHROME_HEADLESS', 354 'CHROME_HEADLESS',
355 'CHROMIUM_BUILD', 355 'CHROMIUM_BUILD',
356 'COMSPEC', 356 'COMSPEC',
357 'COMPUTERNAME', 357 'COMPUTERNAME',
358 'DBUS_SESSION_BUS_ADDRESS',
358 'DXSDK_DIR', 359 'DXSDK_DIR',
359 'HOMEDRIVE', 360 'HOMEDRIVE',
360 'HOMEPATH', 361 'HOMEPATH',
361 'LOCALAPPDATA', 362 'LOCALAPPDATA',
362 'NUMBER_OF_PROCESSORS', 363 'NUMBER_OF_PROCESSORS',
363 'OS', 364 'OS',
364 'PATH', 365 'PATH',
365 'PATHEXT', 366 'PATHEXT',
366 'PROCESSOR_ARCHITECTURE', 367 'PROCESSOR_ARCHITECTURE',
367 'PROCESSOR_ARCHITEW6432', 368 'PROCESSOR_ARCHITEW6432',
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
483 if skip_sync_arg not in sys.argv: 484 if skip_sync_arg not in sys.argv:
484 UseBotoPath() 485 UseBotoPath()
485 if subprocess.call([GetGClientPath(), 'sync', '--force']) != 0: 486 if subprocess.call([GetGClientPath(), 'sync', '--force']) != 0:
486 print >> sys.stderr, ( 487 print >> sys.stderr, (
487 '(%s) `gclient sync` failed; proceeding anyway...' % sys.argv[0]) 488 '(%s) `gclient sync` failed; proceeding anyway...' % sys.argv[0])
488 os.execv(sys.executable, [sys.executable] + sys.argv + [skip_sync_arg]) 489 os.execv(sys.executable, [sys.executable] + sys.argv + [skip_sync_arg])
489 490
490 # Remove skip_sync_arg from arg list. Needed because twistd. 491 # Remove skip_sync_arg from arg list. Needed because twistd.
491 sys.argv.remove(skip_sync_arg) 492 sys.argv.remove(skip_sync_arg)
492 main() 493 main()
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698