From 06559c6867763e644dcf55cae8722e4c98a232b1 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Wed, 23 Jan 2013 23:49:25 +0100 Subject: [PATCH] Bug 833946 - Don't scan the entire tree for a root manifest in the packager. r=gps --- python/mozbuild/mozpack/packager/__init__.py | 2 +- python/mozbuild/mozpack/test/test_packager.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/mozbuild/mozpack/packager/__init__.py b/python/mozbuild/mozpack/packager/__init__.py index 10c82db88fe1..cfaaeb0fbbd1 100644 --- a/python/mozbuild/mozpack/packager/__init__.py +++ b/python/mozbuild/mozpack/packager/__init__.py @@ -246,7 +246,7 @@ class SimpleManifestSink(object): paths = [mozpack.path.dirname(m) for m in self._manifests] path = mozpack.path.dirname(mozpack.path.commonprefix(paths)) for p, f in self._finder.find(mozpack.path.join(path, - '**', 'chrome.manifest')): + 'chrome.manifest')): if not p in self._manifests: self.packager.add(SimpleManifestSink.normalize_path(p), f) self.packager.close() diff --git a/python/mozbuild/mozpack/test/test_packager.py b/python/mozbuild/mozpack/test/test_packager.py index f403a29cfbc5..5a2e8a8a6509 100644 --- a/python/mozbuild/mozpack/test/test_packager.py +++ b/python/mozbuild/mozpack/test/test_packager.py @@ -222,7 +222,7 @@ class TestSimpleManifestSink(unittest.TestCase): 'bin/foo/qux', 'bin/foo/chrome.manifest', 'bin/bar', - 'bin/**/chrome.manifest' + 'bin/chrome.manifest' ])