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

Bundlebuilder: submodules can have "/.git" as a file

Browse Source 
When created via "git submodules add", a submodules may have the
"/.git" path be a file rather than a directory.  The bundlebuilder
previously thought that all submodules had "/.git" as a directory.
This commit is contained in:
Sam Parkinson 2016-07-14 16:16:25 +10:00
parent 7722015bf9
commit c288d54ab8
No known key found for this signature in database
GPG Key ID: 34E268B2FA2F8B13
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,7 +205,7 @@ class Packager(object):
if not ignore: if not ignore:
sub_path = os.path.join(root, line) sub_path = os.path.join(root, line)
if os.path.isdir(sub_path) \ if os.path.isdir(sub_path) \
and os.path.isdir(os.path.join(sub_path, '.git')): and os.path.exists(os.path.join(sub_path, '.git')):
sub_list = self.get_files_in_git(sub_path) sub_list = self.get_files_in_git(sub_path)
for f in sub_list: for f in sub_list:
files.append(os.path.join(line, f)) files.append(os.path.join(line, f))