mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 13:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix cleanup so we don't have to clobber as much when failures occur

Browse Source 
Change-Id: I120c49a38d2a17a2216296a68378fee7345f616a

TBR=petkov

Review URL: http://codereview.chromium.org/3255004
This commit is contained in:
Chris Sosa 2010-08-30 22:37:28 -07:00
parent ae26a5cbbf
commit e13960240b
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/cbuildbot.py
View File

@ -216,6 +216,7 @@ def _FullCheckout(buildroot, rw_checkout=True, retries=_DEFAULT_RETRIES):
def _IncrementalCheckout(buildroot, rw_checkout=True, def _IncrementalCheckout(buildroot, rw_checkout=True,
retries=_DEFAULT_RETRIES): retries=_DEFAULT_RETRIES):
"""Performs a checkout without clobbering previous checkout.""" """Performs a checkout without clobbering previous checkout."""
_UprevCleanup(buildroot, error_ok=True)
RepoSync(buildroot, rw_checkout, retries) RepoSync(buildroot, rw_checkout, retries)
@ -281,12 +282,12 @@ def _UprevPackages(buildroot, revisionfile, board):
_UprevAllPackages(buildroot) _UprevAllPackages(buildroot)
def _UprevCleanup(buildroot): def _UprevCleanup(buildroot, error_ok=False):
"""Clean up after a previous uprev attempt.""" """Clean up after a previous uprev attempt."""
cwd = os.path.join(buildroot, 'src', 'scripts') cwd = os.path.join(buildroot, 'src', 'scripts')
RunCommand(['./cros_mark_as_stable', '--srcroot=..', RunCommand(['./cros_mark_as_stable', '--srcroot=..',
'--tracking_branch="cros/master"', 'clean'], '--tracking_branch="cros/master"', 'clean'],
cwd=cwd) cwd=cwd, error_ok=error_ok)
def _UprevPush(buildroot): def _UprevPush(buildroot):

7
lib/cros_build_lib.py
View File

@ -34,6 +34,7 @@ def RunCommand(cmd, print_cmd=True, error_ok=False, error_message=None,
stdout = None stdout = None
stderr = None stderr = None
stdin = None stdin = None
output = ''
# Modify defaults based on parameters. # Modify defaults based on parameters.
if redirect_stdout: stdout = subprocess.PIPE if redirect_stdout: stdout = subprocess.PIPE
@ -45,6 +46,7 @@ def RunCommand(cmd, print_cmd=True, error_ok=False, error_message=None,
if print_cmd: if print_cmd:
Info('RunCommand: %s' % ' '.join(cmd)) Info('RunCommand: %s' % ' '.join(cmd))
try:
proc = subprocess.Popen(cmd, cwd=cwd, stdin=stdin, proc = subprocess.Popen(cmd, cwd=cwd, stdin=stdin,
stdout=stdout, stderr=stderr) stdout=stdout, stderr=stderr)
(output, error) = proc.communicate(input) (output, error) = proc.communicate(input)
@ -54,6 +56,11 @@ def RunCommand(cmd, print_cmd=True, error_ok=False, error_message=None,
if not error_ok and proc.returncode: if not error_ok and proc.returncode:
raise Exception('Command "%s" failed.\n' % (' '.join(cmd)) + raise Exception('Command "%s" failed.\n' % (' '.join(cmd)) +
(error_message or error or output or '')) (error_message or error or output or ''))
except Exception,e:
if not error_ok:
raise
else:
Warning(str(e))
return output return output