Bug 1480742 - Ignore paths starting with 'localization/' when searching for duplicates in installer r=Pike a=Android-Nightly-fix
authorFrancesco Lodolo (:flod) <flod@lodolo.net>
Fri, 03 Aug 2018 16:47:30 +0300
changeset 826308 3d107866825433ab1168c7d23e94eac727e0f673
parent 826275 9ad7706def240500bb39914bc3706efda4c46fc9
child 826309 eae522ddc81bc4925c0c92c99145bc943bd41291
child 826326 7bf9ee697b963db91f58aa281d63b2b4f7b16866
child 826331 7272dce21e27b2e560776df1dbbdca7ac3a21065
child 826335 dac96602268da3cb4dd100d0fa17d418b3304cdd
child 826341 7e8615c09c2de41ee0dc782382511094899019e0
child 826346 b16525c04fe36ad99f60f1be45d5bae6d4817e29
child 826357 a9065d571214c7a43c931a3f542a99a09c8d3ab3
child 826391 88a0ef6f94ef6cc90196eb8bddb00938b830d968
child 826407 0ea8d7c38d59d5469ba197066f2f04d1c184492c
child 826411 7dd06fe2785bf7b148a67a716165ad4cceb91c1a
child 826413 e2d9f7909004748c63b65d2b77e3669e6384d2e6
child 826415 75762edfa33a68ec4350adac56ef62160e15bb63
child 826417 597a99c7d211b8be9bf25e3336e7f4ad0acb9302
child 826426 8d1e91f0f7245c4dcc84fd94abd842946a6b8402
child 826475 6370e9640a69fe8968a0037c44b80082f6061ff1
child 826476 df334aeb1d4138b13b3a13e9f511d6dbc1827afe
child 826493 c04660a0a8a0060098581e7016d4a30808f3fec8
child 826496 b6162f1c5c77756a6e313ff6f9be4ee9a61568e9
child 826497 29ef7fcafde24993b5d1df48158daa8faf4b2371
child 826540 c4c1a90df788b7634da5a89f417bf55198172640
child 826778 9030c946eea4bf4fc2d7da3cd2d49cc4adf9a8c3
child 826781 023685c7040b26382545c95b5bbeb7575014ac27
child 827051 3c8cc045c210ee2758ec06d5d3618ba6a05e5cfa
child 827064 4b8eb2488870f08ce363f9e4150884a59471debb
child 827090 3800a5d861fde597e736654d6d73431b63b48e64
child 827091 d8a17a09bdef058d12f74aae7b38bd422a475c23
child 827092 4f6a182a9586dcab5aec955bc64bf0aa2a94c59a
child 827101 00566e92e2d05e66231e06a327a9d28b2e9e88e2
child 827283 2b09cfb7f4c81d2769d50b4314373f7823c02721
child 827338 e142220dd8df6ae0199cfdbd74821379dfb036eb
child 828345 b7fbc5fb29e1937d960daaec2a1e34a041888939
child 828346 683a5b6b1c90a1b4ea089f18c309c3a950158ec7
push id118287
push userjhofmann@mozilla.com
push dateFri, 03 Aug 2018 14:35:58 +0000
reviewersPike, Android-Nightly-fix
bugs1480742
milestone63.0a1
Bug 1480742 - Ignore paths starting with 'localization/' when searching for duplicates in installer r=Pike a=Android-Nightly-fix Reviewers: Pike Reviewed By: Pike Bug #: 1480742 Differential Revision: https://phabricator.services.mozilla.com/D2718
toolkit/mozapps/installer/find-dupes.py
--- a/toolkit/mozapps/installer/find-dupes.py
+++ b/toolkit/mozapps/installer/find-dupes.py
@@ -29,17 +29,19 @@ def normalize_osx_path(p):
     'baz'
     '''
     bits = p.split('/')
     if len(bits) > 3 and bits[0].endswith('.app'):
         return '/'.join(bits[3:])
     return p
 
 def is_l10n_file(path):
-    return '/locale/' in path or '/localization/' in path
+    return ('/locale/' in path or
+            '/localization/' in path or
+            path.startswith('localization/'))
 
 def normalize_path(p):
     return normalize_osx_path(p)
 
 
 def find_dupes(source, allowed_dupes, bail=True):
     allowed_dupes = set(allowed_dupes)
     md5s = OrderedDict()