Skip to content

Commit

Permalink
Remove nulls from the edify generator.
Browse files Browse the repository at this point in the history
These would break the scripts. WTF are they doing here?

Change-Id: I0c52335a27f7ae974279fde1c2461b2dba24d263
  • Loading branch information
rmcc authored and andi34 committed Aug 8, 2016
1 parent afd0710 commit 1812af2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tools/releasetools/edify_generator.py
Expand Up @@ -117,7 +117,7 @@ def AssertOlderBuild(self, timestamp, timestamp_text):
def AssertDevice(self, device):
"""Assert that the device identifier is the given string."""
cmd = ('assert(' +
' || \0'.join(['getprop("ro.product.device") == "%s" || getprop("ro.build.product") == "%s"'
' || '.join(['getprop("ro.product.device") == "%s" || getprop("ro.build.product") == "%s"'
% (i, i) for i in device.split(",")]) +
' || abort("This package is for device: %s; ' +
'this device is " + getprop("ro.product.device") + ".");' +
Expand All @@ -127,7 +127,7 @@ def AssertDevice(self, device):
def AssertSomeBootloader(self, *bootloaders):
"""Asert that the bootloader version is one of *bootloaders."""
cmd = ("assert(" +
" ||\0".join(['getprop("ro.bootloader") == "%s"' % (b,)
" || ".join(['getprop("ro.bootloader") == "%s"' % (b,)
for b in bootloaders]) +
");")
self.script.append(self._WordWrap(cmd))
Expand Down

0 comments on commit 1812af2

Please sign in to comment.