Bug 888646 - Update missed use of SimpleManifestSink API. a=bajaj
authorNick Alexander <nalexander@mozilla.com>
Sat, 29 Jun 2013 20:15:08 -0700
changeset 148143 0368f4123c8aeb2209582fb8faf3bcb04acd0e13
parent 148142 7844db8f7d37282e09493b3e8deab037231e5129
child 148144 64c5cc9bad2e84a9b1d6392b095ad06a75b94a4e
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbajaj
bugs888646, 887121
milestone24.0a2
Bug 888646 - Update missed use of SimpleManifestSink API. a=bajaj This is a simple follow-up to Bug 887121.
toolkit/mozapps/installer/packager.py
--- a/toolkit/mozapps/installer/packager.py
+++ b/toolkit/mozapps/installer/packager.py
@@ -5,16 +5,17 @@
 from mozpack.packager.formats import (
     FlatFormatter,
     JarFormatter,
     OmniJarFormatter,
 )
 from mozpack.packager import (
     preprocess_manifest,
     preprocess,
+    Component,
     SimpleManifestSink,
 )
 from mozpack.files import (
     GeneratedFile,
     FileFinder,
     File,
 )
 from mozpack.copier import (
@@ -310,17 +311,17 @@ def main():
             sinkformatter = NoPkgFilesRemover(formatter,
                                               args.manifest is not None)
         else:
             sinkformatter = formatter
         sink = SimpleManifestSink(finder, sinkformatter)
         if args.manifest:
             preprocess_manifest(sink, args.manifest, defines)
         else:
-            sink.add('', 'bin/*')
+            sink.add(Component(''), 'bin/*')
         sink.close(args.manifest is not None)
 
         if args.removals:
             lines = [l.lstrip() for l in open(args.removals).readlines()]
             removals_in = StringIO(''.join(lines))
             removals_in.name = args.removals
             removals = RemovedFiles(copier)
             preprocess(removals_in, removals, defines)