(PDK-804) Fixes error in build without ignore file #425
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bmjen
force-pushed
the
pdk-804
branch
3 times, most recently
from
eba85a0 to
c0d55f8
Compare
bmjen
changed the title
rodjek
suggested changes
Feb 13, 2018
lib/pdk/module/build.rb
Outdated
| @@ -196,6 +196,13 @@ def ignored_files | |||
|
|
|||
| PathSpec.new(data) | |||
| end | |||
|
|
|||
| # Also ignore the target directory if it is in the module dir and not already ignored | |||
| if Find.find(@module_dir).include?(@target_dir) && !@ignored_files.match(File.basename(@target_dir) + '/') | |||
There was a problem hiding this comment.
Rather than calling Find.find here (which might get expensive), could we get away with something like:
if @ignored_files.specs_matching(target_dir).empty?
@ignored_files.add("\/#{File.basename(target_dir)}\/")
endThere was a problem hiding this comment.
That wouldn't guard against the scenario where target-dir wasn't a sub directory of the module_dir. If target-dir was /tmp/pkg/ then @ignored_files.specs_matching('/tmp/pkg/').empty? would be true, and /pkg/ would get added to the ignored_files a second time.
lib/pdk/module/build.rb
Outdated
|
|
||
| # Also ignore the target directory if it is in the module dir and not already ignored | ||
| if Find.find(@module_dir).include?(@target_dir) && !@ignored_files.match(File.basename(@target_dir) + '/') | ||
| @ignored_files = @ignored_files.add("\/#{File.basename(@target_dir)}\/") |
There was a problem hiding this comment.
Should use target_dir reader method rather than referencing the instance variable directly (here and in the line above), makes it easier to mock when unit testing.
pdk will now make sure that if there is no ignore file and if the pkg target-dir is in the module_dir, then it will add the target-dir to the ignores list.
rodjek
approved these changes
Feb 13, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
pdk will now make sure that if there is no ignore file and if the pkg
target-dir is in the module_dir, then it will add the target-dir
to the ignores list.