| Index: telemetry/telemetry/wpr/archive_info.py
|
| diff --git a/telemetry/telemetry/wpr/archive_info.py b/telemetry/telemetry/wpr/archive_info.py
|
| index 326da2d36b7411bcd7a7db5aa1212dc1f4991ab2..8ef370b19b259326219803fccb4ab64c5ef139e7 100644
|
| --- a/telemetry/telemetry/wpr/archive_info.py
|
| +++ b/telemetry/telemetry/wpr/archive_info.py
|
| @@ -9,9 +9,12 @@ import re
|
| import shutil
|
| import tempfile
|
|
|
| +from telemetry.wpr import archive_info2
|
| +
|
| from py_utils import cloud_storage # pylint: disable=import-error
|
|
|
|
|
| +# TODO(rnephew): Remove this file when archive_info2 is the default.
|
| def AssertValidCloudStorageBucket(bucket):
|
| is_valid = bucket in (None,
|
| cloud_storage.PUBLIC_BUCKET,
|
| @@ -56,6 +59,8 @@ class WprArchiveInfo(object):
|
| if os.path.exists(file_path):
|
| with open(file_path, 'r') as f:
|
| data = json.load(f)
|
| + if data.get('platform_specific', False):
|
| + return archive_info2.WprArchiveInfo(file_path, data, bucket)
|
| return cls(file_path, data, bucket)
|
| return cls(file_path, {'archives': {}}, bucket)
|
|
|
| @@ -97,7 +102,8 @@ class WprArchiveInfo(object):
|
| "upload_to_cloud_storage")
|
| raise
|
|
|
| - def WprFilePathForStory(self, story):
|
| + def WprFilePathForStory(self, story, target_platform=None):
|
| + del target_platform
|
| if self.temp_target_wpr_file_path:
|
| return self.temp_target_wpr_file_path
|
| wpr_file = self._story_name_to_wpr_file.get(story.display_name, None)
|
|
|