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

Bundlebuilder check if activity files are in git

Browse Source 
git version 1.9.3, in a activity directory created inside sugar-build/activities
return a empty string when the command "git ls-files" is executed,
and no repository is configured.
We need verify that condition, and process a file list from the filesystem.
This commit is contained in:
Gonzalo Odiard 2014-10-13 22:54:53 -03:00
parent 16617b22d7
commit e50a90c243
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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):