diff options
| author | Bert Freudenberg <bert@freudenbergs.de> | 2007-07-10 12:43:56 (GMT) |
|---|---|---|
| committer | Bert Freudenberg <bert@freudenbergs.de> | 2007-07-10 12:43:56 (GMT) |
| commit | d16a2fb44a949363d8b24f153dc701768306b32f (patch) | |
| tree | 3db4df979648ca92f250951bb26913885f9f3335 /sugar | |
| parent | e14288abb352cc4a611d03b8174b26102563237b (diff) | |
bundlebuilder: include files only once if both default and in MANIFEST
Diffstat (limited to 'sugar')
| -rw-r--r-- | sugar/activity/bundlebuilder.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sugar/activity/bundlebuilder.py b/sugar/activity/bundlebuilder.py index a5f0f1a..16e47f7 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): |