releasetools: Make _GetPropertyFilesString public
ota_from_target_files.py: Rename PropertyFiles._GetPropertyFilesString to PropertyFiles.GetPropertyFilesString. Currently only PropertyFiles.Compute and PropertyFiles.Finalize gives access to _GetPropertyFilesString. But Compute force sets reserve_space=True, and Finalize requires reserved_length. _GetPropertyFilesString is useful method that can be used outside releasetools. One of the usage is in bootable/recovery/updater_sample/. Test: python -m unittest test_ota_from_target_files Change-Id: I2cc44ec46a0e68ba071531b003af8cdbfe90e588 Signed-off-by: Zhomart Mukhamejanov <zhomart@google.com>
This commit is contained in:
@@ -1026,7 +1026,7 @@ class PropertyFiles(object):
|
||||
A string with placeholders for the metadata offset/size info, e.g.
|
||||
"payload.bin:679:343,payload_properties.txt:378:45,metadata: ".
|
||||
"""
|
||||
return self._GetPropertyFilesString(input_zip, reserve_space=True)
|
||||
return self.GetPropertyFilesString(input_zip, reserve_space=True)
|
||||
|
||||
class InsufficientSpaceException(Exception):
|
||||
pass
|
||||
@@ -1055,7 +1055,7 @@ class PropertyFiles(object):
|
||||
InsufficientSpaceException: If the reserved length is insufficient to hold
|
||||
the final string.
|
||||
"""
|
||||
result = self._GetPropertyFilesString(input_zip, reserve_space=False)
|
||||
result = self.GetPropertyFilesString(input_zip, reserve_space=False)
|
||||
if len(result) > reserved_length:
|
||||
raise self.InsufficientSpaceException(
|
||||
'Insufficient reserved space: reserved={}, actual={}'.format(
|
||||
@@ -1074,12 +1074,22 @@ class PropertyFiles(object):
|
||||
Raises:
|
||||
AssertionError: On finding a mismatch.
|
||||
"""
|
||||
actual = self._GetPropertyFilesString(input_zip)
|
||||
actual = self.GetPropertyFilesString(input_zip)
|
||||
assert actual == expected, \
|
||||
"Mismatching streaming metadata: {} vs {}.".format(actual, expected)
|
||||
|
||||
def _GetPropertyFilesString(self, zip_file, reserve_space=False):
|
||||
"""Constructs the property-files string per request."""
|
||||
def GetPropertyFilesString(self, zip_file, reserve_space=False):
|
||||
"""
|
||||
Constructs the property-files string per request.
|
||||
|
||||
Args:
|
||||
zip_file: The input ZIP file.
|
||||
reserved_length: The reserved length of the property-files string.
|
||||
|
||||
Returns:
|
||||
A property-files string including the metadata offset/size info, e.g.
|
||||
"payload.bin:679:343,payload_properties.txt:378:45,metadata: ".
|
||||
"""
|
||||
|
||||
def ComputeEntryOffsetSize(name):
|
||||
"""Computes the zip entry offset and size."""
|
||||
|
Reference in New Issue
Block a user