Use cros_workon from path rather than from scripts dir.
BUG=chromium-os:12668
TEST=verify that cros_workon works from path
Change-Id: I6ec1b8f458994fb582e4d317618cfc0452b1d923
Review URL: http://codereview.chromium.org/6594128
diff --git a/builder.py b/builder.py
index e7bccae..bf83c3e 100644
--- a/builder.py
+++ b/builder.py
@@ -15,9 +15,6 @@
def _OutputOf(command):
"""Runs command, a list of arguments beginning with an executable.
- If the executable begins with "scripts/", the path is adjusted to
- the scripts directory of this chroot.
-
Args:
command: A list of arguments, beginning with the executable
Returns:
@@ -25,10 +22,6 @@
Raises:
subprocess.CalledProcessError if the command fails
"""
- scripts = 'scripts/'
- if command[0].find(scripts) == 0:
- server_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
- command[0] = command[0].replace(scripts, server_dir + '/../../' + scripts)
command_name = ' '.join(command)
cherrypy.log('Executing: ' + command_name, 'BUILD')
@@ -44,12 +37,12 @@
def _ShouldBeWorkedOn(self, board, pkg):
"""Is pkg a package that could be worked on, but is not?"""
- if pkg in _OutputOf(['scripts/cros_workon', '--board=' + board, 'list']):
+ if pkg in _OutputOf(['cros_workon', '--board=' + board, 'list']):
return False
# If it's in the list of possible workon targets, we should be working on it
return pkg in _OutputOf([
- 'scripts/cros_workon', '--board=' + board, 'list', '--all'])
+ 'cros_workon', '--board=' + board, 'list', '--all'])
def SetError(self, text):
cherrypy.response.status = 500