From e50a90c243bbff2ce8ac298982d88bfd977a19ae Mon Sep 17 00:00:00 2001 From: Gonzalo Odiard Date: Mon, 13 Oct 2014 22:54:53 -0300 Subject: [PATCH] Bundlebuilder check if activity files are in git 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. --- src/sugar3/activity/bundlebuilder.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/sugar3/activity/bundlebuilder.py b/src/sugar3/activity/bundlebuilder.py index 7285e66e..3a090e83 100644 --- a/src/sugar3/activity/bundlebuilder.py +++ b/src/sugar3/activity/bundlebuilder.py @@ -178,9 +178,12 @@ class Packager(object): 'fall back to filtered list') return list_files(self.config.source_dir, IGNORE_DIRS, IGNORE_FILES) - - # pylint: disable=E1103 - return [path.strip() for path in stdout.strip('\n').split('\n')] + if stdout: + # pylint: disable=E1103 + 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):