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

Side by Side Diff: pydir/utils.py

Issue 1565963002: Better error message for running szbuild.py out of directory. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Created 4 years, 11 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
« 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 import os 1 import os
2 import subprocess 2 import subprocess
3 import sys 3 import sys
4 4
5 def shellcmd(command, echo=True): 5 def shellcmd(command, echo=True):
6 if not isinstance(command, str): 6 if not isinstance(command, str):
7 command = ' '.join(command) 7 command = ' '.join(command)
8 8
9 if echo: print '[cmd]', command 9 if echo: print '[cmd]', command
10 10
11 stdout_result = subprocess.check_output(command, shell=True) 11 stdout_result = subprocess.check_output(command, shell=True)
12 if echo: sys.stdout.write(stdout_result) 12 if echo: sys.stdout.write(stdout_result)
13 return stdout_result 13 return stdout_result
14 14
15 def FindBaseNaCl(): 15 def FindBaseNaCl():
16 """Find the base native_client/ directory.""" 16 """Find the base native_client/ directory."""
17 nacl = 'native_client' 17 nacl = 'native_client'
18 path_list = os.getcwd().split(os.sep) 18 path_list = os.getcwd().split(os.sep)
19 if nacl not in path_list: 19 if nacl not in path_list:
20 return None 20 print "Script must be executed from within \'native_client\' directory"
Jim Stichnoth 2016/01/07 01:15:58 I would use one of these strings instead: print
21 exit(1)
21 last_index = len(path_list) - path_list[::-1].index(nacl) 22 last_index = len(path_list) - path_list[::-1].index(nacl)
22 return os.sep.join(path_list[:last_index]) 23 return os.sep.join(path_list[:last_index])
23 24
24 def get_sfi_string(args, sb_ret, nonsfi_ret, native_ret): 25 def get_sfi_string(args, sb_ret, nonsfi_ret, native_ret):
25 """Return a value depending on args.sandbox and args.nonsfi.""" 26 """Return a value depending on args.sandbox and args.nonsfi."""
26 if args.sandbox: 27 if args.sandbox:
27 assert(not args.nonsfi) 28 assert(not args.nonsfi)
28 return sb_ret 29 return sb_ret
29 if args.nonsfi: 30 if args.nonsfi:
30 return nonsfi_ret 31 return nonsfi_ret
31 return native_ret 32 return native_ret
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