bundlebuilder: MANIFEST was still included twice ... fix for real now
This commit is contained in:
parent
ac082511a2
commit
c1fa54c0c0
@ -54,22 +54,18 @@ class _DefaultFileList(list):
|
|||||||
if os.path.isfile(_get_source_path('NEWS')):
|
if os.path.isfile(_get_source_path('NEWS')):
|
||||||
self.append('NEWS')
|
self.append('NEWS')
|
||||||
|
|
||||||
class _ManifestFileList(list):
|
class _ManifestFileList(_DefaultFileList):
|
||||||
def __init__(self, manifest):
|
def __init__(self, manifest):
|
||||||
|
_DefaultFileList.__init__(self)
|
||||||
self.append(manifest)
|
self.append(manifest)
|
||||||
|
|
||||||
f = open(manifest,'r')
|
f = open(manifest,'r')
|
||||||
for line in f.readlines():
|
for line in f.readlines():
|
||||||
stripped_line = line.strip()
|
stripped_line = line.strip()
|
||||||
if stripped_line:
|
if stripped_line and not stripped_line in self:
|
||||||
self.append(stripped_line)
|
self.append(stripped_line)
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
defaults = _DefaultFileList()
|
|
||||||
for path in defaults:
|
|
||||||
if not path in self:
|
|
||||||
self.append(path)
|
|
||||||
|
|
||||||
def _extract_bundle(source_file, dest_dir):
|
def _extract_bundle(source_file, dest_dir):
|
||||||
if not os.path.exists(dest_dir):
|
if not os.path.exists(dest_dir):
|
||||||
os.mkdir(dest_dir)
|
os.mkdir(dest_dir)
|
||||||
|
Loading…
Reference in New Issue
Block a user