From 6bd724561d55efe18658437c1f763ef7f579949b Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Fri, 2 Mar 2018 08:34:39 -0500 Subject: [PATCH] Bug 1442378 - part 5 - make multiple occurrences of the same file fatal; r=jmaher We shouldn't really have this problem, and shouting about it early will make sure that we address issues like multiple instances of omni.ja, rather than not recording information that we should have been. --- .../mozharness/mozilla/building/buildbase.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/testing/mozharness/mozharness/mozilla/building/buildbase.py b/testing/mozharness/mozharness/mozilla/building/buildbase.py index 0bccc04bc0e8..602be1703b12 100755 --- a/testing/mozharness/mozharness/mozilla/building/buildbase.py +++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py @@ -1612,17 +1612,14 @@ or run without that action (ie: --no-{action})" if containing_dir == 'browser': name = 'browser-omni.ja' if name in subtests: - # File seen twice in same archive; - # ignore to avoid confusion. - subtests[name] = None - else: - subtests[name] = size + self.fatal('should not see %s (%s) multiple times!' + % (name, path)) + subtests[name] = size for name in subtests: - if subtests[name] is not None: - self.info('Size of %s: %s bytes' % (name, - subtests[name])) - size_measurements.append( - {'name': name, 'value': subtests[name]}) + self.info('Size of %s: %s bytes' % (name, + subtests[name])) + size_measurements.append( + {'name': name, 'value': subtests[name]}) except: self.info('Unable to search %s for component sizes.' % installer) size_measurements = []