wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1143510 - Fix line numbers for removal errors during make package. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2015-03-16 08:18:39 +09:00
parent 97d5238558
commit 770a0bd827
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toolkit/mozapps/installer/packager.py
View File

@ -179,6 +179,8 @@ class RemovedFiles(GeneratedFile):
def handle_line(self, str): def handle_line(self, str):
f = str.strip() f = str.strip()
if not f:
return
if self.copier.contains(f): if self.copier.contains(f):
errors.error('Removal of packaged file(s): %s' % f) errors.error('Removal of packaged file(s): %s' % f)
self.content += f + '\n' self.content += f + '\n'
@ -344,8 +346,7 @@ def main():
sink.close(args.manifest is not None) sink.close(args.manifest is not None)
if args.removals: if args.removals:
lines = [l.lstrip() for l in open(args.removals).readlines()] removals_in = StringIO(open(args.removals).read())
removals_in = StringIO(''.join(lines))
removals_in.name = args.removals removals_in.name = args.removals
removals = RemovedFiles(copier) removals = RemovedFiles(copier)
preprocess(removals_in, removals, defines) preprocess(removals_in, removals, defines)