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

Simplify routine used to get the list of files from git

Browse Source 
This change remove duplicated code
This commit is contained in:
Gonzalo Odiard 2015-05-07 13:30:52 -03:00 committed by Sam Parkinson
parent 34b0e17e95
commit bbdebce0d4
1 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,7 @@ class Packager(object):
os.mkdir(self.config.dist_dir)
def get_files_in_git(self):
git_ls = None
try:
git_ls = subprocess.Popen(['git', 'ls-files'],
stdout=subprocess.PIPE,
@ -176,37 +177,34 @@ class Packager(object):
except OSError:
logging.warn('Packager: git is not installed, '
'fall back to filtered list')
return list_files(self.config.source_dir,
IGNORE_DIRS, IGNORE_FILES)
stdout, _ = git_ls.communicate()
if git_ls.returncode:
# Fall back to filtered list
logging.warn('Packager: this is not a git repository, '
'fall back to filtered list')
return list_files(self.config.source_dir,
IGNORE_DIRS, IGNORE_FILES)
if stdout:
# pylint: disable=E1103
git_output = [path.strip() for path in
stdout.strip('\n').split('\n')]
files = []
for line in git_output:
ignore = False
for directory in IGNORE_DIRS:
if line.startswith(directory + '/'):
ignore = True
break
if not ignore:
files.append(line)
if git_ls is not None:
stdout, _ = git_ls.communicate()
if git_ls.returncode:
# Fall back to filtered list
logging.warn('Packager: this is not a git repository, '
'fall back to filtered list')
elif stdout:
# pylint: disable=E1103
git_output = [path.strip() for path in
stdout.strip('\n').split('\n')]
files = []
for line in git_output:
ignore = False
for directory in IGNORE_DIRS:
if line.startswith(directory + '/'):
ignore = True
break
if not ignore:
files.append(line)
for pattern in IGNORE_FILES:
files = [f for f in files if not fnmatch(f, pattern)]
for pattern in IGNORE_FILES:
files = [f for f in files if not fnmatch(f, pattern)]
return files
else:
return list_files(self.config.source_dir,
IGNORE_DIRS, IGNORE_FILES)
return files
return list_files(self.config.source_dir,
IGNORE_DIRS, IGNORE_FILES)
class XOPackager(Packager):