@ -62,7 +62,7 @@ class Checkout(object):
def run ( self , cmd , * * kwargs ) :
def run ( self , cmd , * * kwargs ) :
print ' Running: %s ' % ( ' ' . join ( pipes . quote ( x ) for x in cmd ) )
print ' Running: %s ' % ( ' ' . join ( pipes . quote ( x ) for x in cmd ) )
if self . options . dry_run :
if self . options . dry_run :
return ' '
return 0
return subprocess . check_output ( cmd , * * kwargs )
return subprocess . check_output ( cmd , * * kwargs )
@ -133,7 +133,7 @@ class GclientGitCheckout(GclientCheckout, GitCheckout):
# Configure and do the gclient checkout.
# Configure and do the gclient checkout.
self . run_gclient ( ' config ' , ' --spec ' , self . _format_spec ( ) )
self . run_gclient ( ' config ' , ' --spec ' , self . _format_spec ( ) )
sync_cmd = [ ' sync ' ]
sync_cmd = [ ' sync ' ]
if self . options . nohooks or self . spec . get ( ' fetch_hooks ' ) :
if self . options . nohooks :
sync_cmd . append ( ' --nohooks ' )
sync_cmd . append ( ' --nohooks ' )
if self . options . no_history :
if self . options . no_history :
sync_cmd . append ( ' --no-history ' )
sync_cmd . append ( ' --no-history ' )
@ -141,11 +141,6 @@ class GclientGitCheckout(GclientCheckout, GitCheckout):
sync_cmd . append ( ' --with_branch_heads ' )
sync_cmd . append ( ' --with_branch_heads ' )
self . run_gclient ( * sync_cmd )
self . run_gclient ( * sync_cmd )
for cmd in self . spec . get ( ' fetch_hooks ' , [ ] ) :
self . run ( cmd )
if self . spec . get ( ' fetch_hooks ' ) and not self . options . nohooks :
self . run_gclient ( ' runhooks ' )
# Configure git.
# Configure git.
wd = os . path . join ( self . base , self . root )
wd = os . path . join ( self . base , self . root )
if self . options . dry_run :
if self . options . dry_run :