diff options
author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-03-12 14:43:04 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-03-12 14:43:04 (GMT) |
commit | c4dce659a4be7cbfe2376586e09e6a9c3d316794 (patch) | |
tree | ad7e5cbecf5a05d8ed3cd4b3766fbcb551f6eb7e | |
parent | 9bd24794c0857937ac8ffb3ff8296b43dd75a3f5 (diff) |
Use Popen.communicate() to avoid hang (Sascha Silbe) #397
-rw-r--r-- | src/sugar/activity/bundlebuilder.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py index 71da0df..90fac55 100644 --- a/src/sugar/activity/bundlebuilder.py +++ b/src/sugar/activity/bundlebuilder.py @@ -207,12 +207,13 @@ class SourcePackager(Packager): def get_files(self): git_ls = subprocess.Popen('git-ls-files', stdout=subprocess.PIPE, cwd=self.config.source_dir) - if git_ls.wait(): + stdout, _ = git_ls.communicate() + if git_ls.returncode : # Fall back to filtered list return list_files(self.config.source_dir, IGNORE_DIRS, IGNORE_FILES) - return [path.strip() for path in git_ls.stdout.readlines()] + return [path.strip() for path in '\n'.split(stdout)] def package(self): tar = tarfile.open(self.package_path, 'w:bz2') |