Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix for Fennec 4.0rc1 build3 deb sign fails on keyError 'l10n-dir' p=…

…aki r=lsblakk
  • Loading branch information...
commit 7df9fbefa8183b49bd45d522113010203c450ed1 1 parent 2bb90bc
@lsblakk lsblakk authored
Showing with 17 additions and 13 deletions.
  1. +17 −13 mozharness/l10n/locales.py
View
30 mozharness/l10n/locales.py
@@ -87,20 +87,24 @@ def query_abs_dirs(self):
dirs = {}
dirs['abs_work_dir'] = os.path.join(c['base_work_dir'],
c['work_dir'])
- dirs['abs_l10n_dir'] = os.path.join(dirs['abs_work_dir'],
- c['l10n_dir'])
- dirs['abs_mozilla_dir'] = os.path.join(dirs['abs_work_dir'],
- c['mozilla_dir'])
- dirs['abs_objdir'] = os.path.join(dirs['abs_mozilla_dir'],
- c['objdir'])
- dirs['abs_merge_dir'] = os.path.join(dirs['abs_objdir'],
- 'merged')
- dirs['abs_locales_dir'] = os.path.join(dirs['abs_objdir'],
- c['locales_dir'])
- dirs['abs_locales_src_dir'] = os.path.join(dirs['abs_mozilla_dir'],
+ # TODO prettify this up later
+ if 'l10n_dir' in c:
+ dirs['abs_l10n_dir'] = os.path.join(dirs['abs_work_dir'],
+ c['l10n_dir'])
+ if 'mozilla_dir' in c:
+ dirs['abs_mozilla_dir'] = os.path.join(dirs['abs_work_dir'],
+ c['mozilla_dir'])
+ dirs['abs_locales_src_dir'] = os.path.join(dirs['abs_mozilla_dir'],
+ c['locales_dir'])
+ dirs['abs_l10n_dir'] = os.path.join(dirs['abs_work_dir'],
+ c['l10n_dir'])
+ if 'objdir' in c:
+ dirs['abs_objdir'] = os.path.join(dirs['abs_mozilla_dir'],
+ c['objdir'])
+ dirs['abs_merge_dir'] = os.path.join(dirs['abs_objdir'],
+ 'merged')
+ dirs['abs_locales_dir'] = os.path.join(dirs['abs_objdir'],
c['locales_dir'])
- dirs['abs_l10n_dir'] = os.path.join(dirs['abs_work_dir'],
- c['l10n_dir'])
dirs['abs_compare_locales_dir'] = os.path.join(dirs['abs_work_dir'],
'compare-locales')
for key in dirs.keys():
Please sign in to comment.
Something went wrong with that request. Please try again.