Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ebcli/core/fileoperations.py
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,10 @@ def _zipdir(path, zipf, ignore_list=None):
continue
for d in dirs:
cur_dir = os.path.join(root, d)
if os.path.islink(cur_dir):
if (
os.path.islink(cur_dir)
and not cur_dir in ignore_list
):
# It is probably safe to remove this code since os.walk seems to categorize
# symlinks-to-directories as files. This doesn't matter as far as creation
# of the zip is concerned, but just having the code around is confusing.
Expand Down Expand Up @@ -814,6 +817,9 @@ def get_ebignore_list():

ignore_list = {f for f in spec.match_tree(get_project_root())}
ignore_list.add('.ebignore')

for line in read_from_text_file(location).split("\n"):
ignore_list.add(line)

return ignore_list

Expand Down