ownsource: do not include files more than once in srcbomb

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/hippotatlib/ownsource.py b/hippotatlib/ownsource.py
index 385c9ea3cd47b06f65377f5019856010de12cf7d..8ecc7f2f68f0ef22a8717e8d85001294e540a5aa 100644 (file)
--- a/hippotatlib/ownsource.py
+++ b/hippotatlib/ownsource.py
@@ -342,11 +342,16 @@ class SourceShipmentPreparer():
 
   def mk_inner_portmanteau(s):
     outputs = [s.manifest_name]
 
   def mk_inner_portmanteau(s):
     outputs = [s.manifest_name]

+    outputs_done = { }

     mfh = s.open_output_fh(s.manifest_name,'w')
     for me in s._manifest:
       try: fname = me['file']
       except KeyError: fname = me.get('file_print','')
     mfh = s.open_output_fh(s.manifest_name,'w')
     for me in s._manifest:
       try: fname = me['file']
       except KeyError: fname = me.get('file_print','')

-      else: outputs.append(fname)
+      else:
+        try: outputs_done[fname]
+        except KeyError:
+          outputs.append(fname)
+          outputs_done[fname] = 1

       print('%s\t%s' % (fname, me['info']), file=mfh)
     mfh.close()
 
       print('%s\t%s' % (fname, me['info']), file=mfh)
     mfh.close()