bundlebuilder: include files only once if both default and in MANIFEST
This commit is contained in:
parent
e14288abb3
commit
d16a2fb44a
@ -55,7 +55,7 @@ class _DefaultFileList(list):
|
|||||||
self.append('NEWS')
|
self.append('NEWS')
|
||||||
|
|
||||||
class _ManifestFileList(list):
|
class _ManifestFileList(list):
|
||||||
def __init__(self, manifest=None):
|
def __init__(self, manifest):
|
||||||
self.append(manifest)
|
self.append(manifest)
|
||||||
|
|
||||||
f = open(manifest,'r')
|
f = open(manifest,'r')
|
||||||
@ -67,6 +67,7 @@ class _ManifestFileList(list):
|
|||||||
|
|
||||||
defaults = _DefaultFileList()
|
defaults = _DefaultFileList()
|
||||||
for path in defaults:
|
for path in defaults:
|
||||||
|
if not path in self:
|
||||||
self.append(path)
|
self.append(path)
|
||||||
|
|
||||||
def _extract_bundle(source_file, dest_dir):
|
def _extract_bundle(source_file, dest_dir):
|
||||||
|
Loading…
Reference in New Issue
Block a user