Bug 1196836 - Remove _get_partial_info() from desktop_l10n.py. r=jlund
--- a/scripts/desktop_l10n.py
+++ b/scripts/desktop_l10n.py
@@ -718,24 +718,21 @@ class DesktopSingleLocale(LocalesMixin,
cwd = dirs['abs_locales_dir']
parser = MakeUploadOutputParser(config=self.config,
log_obj=self.log_obj)
retval = self._make(target=target, cwd=cwd, env=env,
halt_on_failure=False, output_parser=parser)
if locale not in self.package_urls:
self.package_urls[locale] = {}
self.package_urls[locale].update(parser.matches)
- if 'partialMarUrl' in self.package_urls[locale]:
- self.package_urls[locale]['partialInfo'] = self._get_partial_info(
- self.package_urls[locale]['partialMarUrl'])
if retval == SUCCESS:
- self.info('Upload successful (%s)' % (locale))
+ self.info('Upload successful (%s)' % locale)
ret = SUCCESS
else:
- self.error('failed to upload %s' % (locale))
+ self.error('failed to upload %s' % locale)
ret = FAILURE
return ret
def get_upload_files(self, locale):
# The tree doesn't have a good way of exporting the list of files
# created during locale generation, but we can grab them by echoing the
# UPLOAD_FILES variable for each locale.
env = self.query_l10n_env()
@@ -806,39 +803,16 @@ class DesktopSingleLocale(LocalesMixin,
dirs = {}
dirs['abs_tools_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'tools')
for key in dirs.keys():
if key not in abs_dirs:
abs_dirs[key] = dirs[key]
self.abs_dirs = abs_dirs
return self.abs_dirs
- def _get_partial_info(self, partial_url):
- """takes a partial url and returns a partial info dictionary"""
- partial_file = partial_url.split('/')[-1]
- # now get from_build...
- # firefox-39.0a1.ar.win32.partial.20150320030211-20150320075143.mar
- # partial file ^ ^ ^
- # | |
- # we need ------------------------+------------+
- from_buildid = partial_file.partition('partial.')[2]
- from_buildid = from_buildid.partition('-')[0]
- self.info('from buildid: {0}'.format(from_buildid))
-
- dirs = self.query_abs_dirs()
- abs_partial_file = os.path.join(dirs['abs_objdir'], 'dist',
- 'update', partial_file)
-
- size = self.query_filesize(abs_partial_file)
- hash_ = self.query_sha512sum(abs_partial_file)
- return [{'from_buildid': from_buildid,
- 'hash': hash_,
- 'size': size,
- 'url': partial_url}]
-
def submit_to_balrog(self):
"""submit to barlog"""
if not self.config.get("balrog_servers"):
self.info("balrog_servers not set; skipping balrog submission.")
return
self.info("Reading buildbot build properties...")
self.read_buildbot_config()
# get platform, appName and hashType from configuration