From d16a2fb44a949363d8b24f153dc701768306b32f Mon Sep 17 00:00:00 2001
From: Bert Freudenberg <bert@freudenbergs.de>
Date: Tue, 10 Jul 2007 14:43:56 +0200
Subject: [PATCH] bundlebuilder: include files only once if both default and in
 MANIFEST

---
 sugar/activity/bundlebuilder.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sugar/activity/bundlebuilder.py b/sugar/activity/bundlebuilder.py
index a5f0f1a2..16e47f78 100644
--- a/sugar/activity/bundlebuilder.py
+++ b/sugar/activity/bundlebuilder.py
@@ -55,7 +55,7 @@ class _DefaultFileList(list):
             self.append('NEWS')
 
 class _ManifestFileList(list):
-    def __init__(self, manifest=None):
+    def __init__(self, manifest):
         self.append(manifest)
 
         f = open(manifest,'r')
@@ -67,7 +67,8 @@ class _ManifestFileList(list):
 
         defaults = _DefaultFileList()
         for path in defaults:
-            self.append(path)
+            if not path in self:
+                self.append(path)
 
 def _extract_bundle(source_file, dest_dir):
         if not os.path.exists(dest_dir):