sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'godiard-bundlebuilder_gitls'

Browse Source
This commit is contained in:
Sam Parkinson 2014-10-18 19:31:08 +11:00
commit f48c3247f6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sugar3/activity/bundlebuilder.py
View File

@ -178,9 +178,12 @@ class Packager(object):
'fall back to filtered list') 'fall back to filtered list')
return list_files(self.config.source_dir, return list_files(self.config.source_dir,
IGNORE_DIRS, IGNORE_FILES) IGNORE_DIRS, IGNORE_FILES)
if stdout:
# pylint: disable=E1103 # pylint: disable=E1103
return [path.strip() for path in stdout.strip('\n').split('\n')] return [path.strip() for path in stdout.strip('\n').split('\n')]
else:
return list_files(self.config.source_dir,
IGNORE_DIRS, IGNORE_FILES)
class XOPackager(Packager): class XOPackager(Packager):