diff options
| author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-07-10 13:19:10 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-07-10 13:19:10 (GMT) |
| commit | 587c1347e1cfe82fc883f4cfe1353c769243571b (patch) | |
| tree | f691372ccbbc8233fbbd1b6e8fd654a45ab4f209 /sugar/activity | |
| parent | 071cc596c598ee7668b33b16a6485839ac25a60e (diff) | |
| parent | d16a2fb44a949363d8b24f153dc701768306b32f (diff) | |
Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
Diffstat (limited to 'sugar/activity')
| -rw-r--r-- | sugar/activity/bundlebuilder.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sugar/activity/bundlebuilder.py b/sugar/activity/bundlebuilder.py index 11fae53..16e47f7 100644 --- a/sugar/activity/bundlebuilder.py +++ b/sugar/activity/bundlebuilder.py @@ -50,13 +50,12 @@ 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') class _ManifestFileList(list): - def __init__(self, manifest=None): + def __init__(self, manifest): self.append(manifest) f = open(manifest,'r') @@ -68,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): |