Merge branch 'godiard-bundlebuilder_gitls'

2014-10-18 19:31:08 +11:00 · 2014-10-18 19:31:08 +11:00 · f48c3247f6
commit f48c3247f6
parent 177fcba84b e50a90c243
1 changed files with 6 additions and 3 deletions
--- 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)
-
+        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):