From e14288abb352cc4a611d03b8174b26102563237b Mon Sep 17 00:00:00 2001 From: Bert Freudenberg Date: Tue, 10 Jul 2007 13:59:34 +0200 Subject: [PATCH 1/2] do not include setup.py in .xo bundle --- sugar/activity/bundlebuilder.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sugar/activity/bundlebuilder.py b/sugar/activity/bundlebuilder.py index 11fae53e..a5f0f1a2 100644 --- a/sugar/activity/bundlebuilder.py +++ b/sugar/activity/bundlebuilder.py @@ -50,7 +50,6 @@ class _DefaultFileList(list): self.append(os.path.join('activity', name)) self.append('activity/activity.info') - self.append('setup.py') if os.path.isfile(_get_source_path('NEWS')): self.append('NEWS') From d16a2fb44a949363d8b24f153dc701768306b32f Mon Sep 17 00:00:00 2001 From: Bert Freudenberg Date: Tue, 10 Jul 2007 14:43:56 +0200 Subject: [PATCH 2/2] 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):