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

Side by Side Diff: gclient.py

Issue 19670012: Check to see if a dependency was skipped in custom_deps, and if so, skip it in (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 7 years, 5 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 """Meta checkout manager supporting both Subversion and GIT. 6 """Meta checkout manager supporting both Subversion and GIT.
7 7
8 Files 8 Files
9 .gclient : Current client configuration, written by 'config' command. 9 .gclient : Current client configuration, written by 'config' command.
10 Format is a Python script defining 'solutions', a list whose 10 Format is a Python script defining 'solutions', a list whose
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 elif len(items) >= 2: 698 elif len(items) >= 2:
699 # Multiple null bytes or a single trailing null byte indicate 699 # Multiple null bytes or a single trailing null byte indicate
700 # git is likely displaying filenames only (such as with -l) 700 # git is likely displaying filenames only (such as with -l)
701 print '\n'.join(mod_path(path) for path in items if path) 701 print '\n'.join(mod_path(path) for path in items if path)
702 else: 702 else:
703 print line 703 print line
704 else: 704 else:
705 print_stdout = True 705 print_stdout = True
706 filter_fn = None 706 filter_fn = None
707 707
708 if os.path.isdir(cwd): 708 if parsed_url is None:
709 print >> sys.stderr, 'Skipped omitted dependency %s' % cwd
710 elif os.path.isdir(cwd):
M-A Ruel 2013/07/18 15:11:43 Shouldn't this check be sufficient? I mean if the
709 try: 711 try:
710 gclient_utils.CheckCallAndFilter( 712 gclient_utils.CheckCallAndFilter(
711 args, cwd=cwd, env=env, print_stdout=print_stdout, 713 args, cwd=cwd, env=env, print_stdout=print_stdout,
712 filter_fn=filter_fn, 714 filter_fn=filter_fn,
713 ) 715 )
714 except subprocess2.CalledProcessError: 716 except subprocess2.CalledProcessError:
715 if not options.ignore: 717 if not options.ignore:
716 raise 718 raise
717 else: 719 else:
718 print >> sys.stderr, 'Skipped missing %s' % cwd 720 print >> sys.stderr, 'Skipped missing %s' % cwd
(...skipping 1130 matching lines...) Expand 10 before | Expand all | Expand 10 after
1849 except (gclient_utils.Error, subprocess2.CalledProcessError), e: 1851 except (gclient_utils.Error, subprocess2.CalledProcessError), e:
1850 print >> sys.stderr, 'Error: %s' % str(e) 1852 print >> sys.stderr, 'Error: %s' % str(e)
1851 return 1 1853 return 1
1852 1854
1853 1855
1854 if '__main__' == __name__: 1856 if '__main__' == __name__:
1855 fix_encoding.fix_encoding() 1857 fix_encoding.fix_encoding()
1856 sys.exit(Main(sys.argv[1:])) 1858 sys.exit(Main(sys.argv[1:]))
1857 1859
1858 # vim: ts=2:sw=2:tw=80:et: 1860 # vim: ts=2:sw=2:tw=80:et:
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