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

Side by Side Diff: lib/webports/source_package.py

Issue 1726863002: Fix typo in source_package.p (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Created 4 years, 10 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 # Copyright (c) 2014 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2014 The Native Client Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import contextlib 5 import contextlib
6 import fnmatch 6 import fnmatch
7 import os 7 import os
8 import re 8 import re
9 import subprocess 9 import subprocess
10 import sys 10 import sys
(...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 if self.config.toolchain == 'emscripten': 382 if self.config.toolchain == 'emscripten':
383 util.setup_emscripten() 383 util.setup_emscripten()
384 env = os.environ.copy() 384 env = os.environ.copy()
385 env['TOOLCHAIN'] = self.config.toolchain 385 env['TOOLCHAIN'] = self.config.toolchain
386 env['NACL_ARCH'] = self.config.arch 386 env['NACL_ARCH'] = self.config.arch
387 env['NACL_DEBUG'] = self.config.debug and '1' or '0' 387 env['NACL_DEBUG'] = self.config.debug and '1' or '0'
388 env['NACL_SDK_ROOT'] = util.get_sdk_root() 388 env['NACL_SDK_ROOT'] = util.get_sdk_root()
389 rtn = subprocess.call(cmd, stdout=sys.stdout, stderr=sys.stderr, 389 rtn = subprocess.call(cmd, stdout=sys.stdout, stderr=sys.stderr,
390 cwd=self.root, env=env) 390 cwd=self.root, env=env)
391 if rtn != 0: 391 if rtn != 0:
392 raise Error('Build failed: %s' % self.InfoString()) 392 raise Error('Build failed: %s' % self.info_string())
393 393
394 def download(self, force_mirror=None): 394 def download(self, force_mirror=None):
395 """Download upstream sources and verify integrity.""" 395 """Download upstream sources and verify integrity."""
396 if self.is_git_upstream(): 396 if self.is_git_upstream():
397 self.git_clone_to_mirror() 397 self.git_clone_to_mirror()
398 return 398 return
399 399
400 archive = self.download_location() 400 archive = self.download_location()
401 if not archive: 401 if not archive:
402 return 402 return
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 if os.path.isdir(package_name): 783 if os.path.isdir(package_name):
784 return SourcePackage(package_name, config) 784 return SourcePackage(package_name, config)
785 785
786 for subdir in DEFAULT_LOCATIONS: 786 for subdir in DEFAULT_LOCATIONS:
787 pkg_root = os.path.join(paths.NACLPORTS_ROOT, subdir, package_name) 787 pkg_root = os.path.join(paths.NACLPORTS_ROOT, subdir, package_name)
788 info = os.path.join(pkg_root, 'pkg_info') 788 info = os.path.join(pkg_root, 'pkg_info')
789 if os.path.exists(info): 789 if os.path.exists(info):
790 return SourcePackage(pkg_root, config) 790 return SourcePackage(pkg_root, config)
791 791
792 raise Error("Package not found: %s" % package_name) 792 raise Error("Package not found: %s" % package_name)
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