mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-28 17:11:34 +02:00
Adding tracking branch broke repo sync on full builders.
Change-Id: Iff1a416a1f7c37870fbcd42ed4aaf6f96f1ea11d BUG=8245 TEST=Ran with --clobber Review URL: http://codereview.chromium.org/4128007
This commit is contained in:
parent
0a4d1665fd
commit
604a3f3168
@ -12,7 +12,7 @@ import optparse
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
"""Number of retries to retry repo sync before giving up"""
|
"""Number of retries to retry repo sync before giving up"""
|
||||||
_NUMBER_OF_RETRIES=3
|
_NUMBER_OF_RETRIES = 3
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
parser = optparse.OptionParser()
|
parser = optparse.OptionParser()
|
||||||
@ -20,16 +20,18 @@ def main():
|
|||||||
help='root directory where sync occurs')
|
help='root directory where sync occurs')
|
||||||
parser.add_option('-c', '--clobber', action='store_true', default=False,
|
parser.add_option('-c', '--clobber', action='store_true', default=False,
|
||||||
help='clobber build directory and do a full checkout')
|
help='clobber build directory and do a full checkout')
|
||||||
|
parser.add_option('-t', '--tracking_branch', default='cros/master',
|
||||||
|
help='Branch to sync against for full checkouts.')
|
||||||
(options, args) = parser.parse_args()
|
(options, args) = parser.parse_args()
|
||||||
if options.buildroot:
|
if options.buildroot:
|
||||||
if options.clobber:
|
if options.clobber:
|
||||||
cbuildbot._FullCheckout(options.buildroot, rw_checkout=False,
|
cbuildbot._FullCheckout(options.buildroot, options.tracking_branch,
|
||||||
retries=_NUMBER_OF_RETRIES)
|
rw_checkout=False, retries=_NUMBER_OF_RETRIES)
|
||||||
else:
|
else:
|
||||||
cbuildbot._IncrementalCheckout(options.buildroot, rw_checkout=False,
|
cbuildbot._IncrementalCheckout(options.buildroot, rw_checkout=False,
|
||||||
retries=_NUMBER_OF_RETRIES)
|
retries=_NUMBER_OF_RETRIES)
|
||||||
else:
|
else:
|
||||||
print >>sys.stderr, 'ERROR: Must set buildroot'
|
print >> sys.stderr, 'ERROR: Must set buildroot'
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
Loading…
x
Reference in New Issue
Block a user