StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bad merge.

Browse Source 
Change-Id: Ifdb2a2999fe13f770c239f47330e8c2c44fdfdbe
This commit is contained in:
Dan Albert
2015-03-27 16:49:01 -07:00
parent 29b415aa77
commit ee8323b629
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/blockimgdiff.py
View File

@@ -421,8 +421,8 @@ class BlockImageDiff(object):
else: else:
raise ValueError("unknown transfer style '%s'\n" % xf.style) raise ValueError("unknown transfer style '%s'\n" % xf.style)
if free_string: if free_string:
out.append("".join(free_string)) out.append("".join(free_string))
# sanity check: abort if we're going to need more than 512 MB if # sanity check: abort if we're going to need more than 512 MB if
# stash space # stash space