lib/docker-sync/sync_strategy/unison.rb in docker-sync-1.0.3 vs lib/docker-sync/sync_strategy/unison.rb in docker-sync-1.0.4
- old
+ new
@@ -95,18 +95,19 @@
end
end
def expand_ignore_strings
expanded_ignore_strings = []
+ default_expanded_ignore_strings = []
exclude_type = 'Name'
exclude_type = @options['sync_excludes_type'] unless @options['sync_excludes_type'].nil?
# use the 'Name' exclude type for all default ignores
# to prevent conflicts with the sync_excludes_type settings
unless Environment.default_ignores.nil?
- expanded_ignore_strings = Environment.default_ignores.map do |pattern|
+ default_expanded_ignore_strings = Environment.default_ignores.map do |pattern|
"-ignore='Name #{pattern}'"
end
end
unless @options['sync_excludes'].nil?
@@ -118,10 +119,10 @@
"#{exclude_type} #{pattern}"
end
"-ignore='#{ignore_string}'"
end
end
- expanded_ignore_strings
+ expanded_ignore_strings.append(default_expanded_ignore_strings).flatten!
end
def sync_options
args = []
args = expand_ignore_strings + args