Skip to content
This repository has been archived by the owner on Feb 26, 2022. It is now read-only.

Commit

Permalink
Bug 730776: Ignore locales from addon-kit package in order to avoid s…
Browse files Browse the repository at this point in the history
…hipping them in xpi.
  • Loading branch information
ochameau committed May 24, 2012
1 parent bef0d95 commit c566385
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion python-lib/cuddlefish/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,8 @@ def run(arguments=sys.argv[1:], target_cfg=None, pkg_cfg=None,

build = packaging.generate_build_for_target(
pkg_cfg, target, used_deps,
include_dep_tests=options.dep_tests
include_dep_tests=options.dep_tests,
is_running_tests=(command == "test")
)

harness_options = {
Expand Down
5 changes: 5 additions & 0 deletions python-lib/cuddlefish/packaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ def get_deps_for_targets(pkg_cfg, targets):
def generate_build_for_target(pkg_cfg, target, deps,
include_tests=True,
include_dep_tests=False,
is_running_tests=False,
default_loader=DEFAULT_LOADER):

build = Bunch(# Contains section directories for all packages:
Expand Down Expand Up @@ -316,6 +317,10 @@ def add_section_to_build(cfg, section, is_code=False,
build.packages[cfg.name][section] = dirname

def add_locale_to_build(cfg):
# Bug 730776: Ignore locales for addon-kit, that are only for unit tests
if not is_running_tests and cfg.name == "addon-kit":
return

path = resolve_dir(cfg, cfg['locale'])
files = os.listdir(path)
for filename in files:
Expand Down

0 comments on commit c566385

Please sign in to comment.