Bug fix for .git submodule files #7
Conversation
| @@ -43,8 +43,10 @@ def validate_changes_on_the_server_not_in_the_repo | |||
| path = cookbook_path.join("#{manifest_record["path"]}") | |||
|
|
|||
| if path.exist? | |||
| checksum = checksum_cookbook_file(path) | |||
| messages << "#{manifest_record['path']}" if checksum != manifest_record['checksum'] | |||
| if path.basename.to_s != '.git' | |||
There was a problem hiding this comment.
why not make the first if a compound condition test a là if path.exist? && path.basename.to_s != '.git'? </nit>
There was a problem hiding this comment.
I don't know how to reproduce that submodule bug, but if you move the condition you end up in the else branch and it's probably not what you want.
In that case I would use a guard clause instead:
if path.exist?
next if path.basename.to_s == '.git'
checksum = checksum_cookbook_file(path)
messages << "#{manifest_record['path']}" if checksum != manifest_record['checksum']
else
|
@kirtfitzpatrick Hey, can you give me more information about that submodule bug, like a log? Thanks! |
|
@gregkare I think we might be running into this too, we're seeing the following in a submodule: ERROR: Errno::EISDIR: Is a directory - /var/hudson/.hudson/workspace/chef-server-git-sync/cookbooks/foo/.git Oddly though, it's only recently started happening - we've had that submodule ever since we've been using knife-inspect. |
|
@jonlives I'll take a look at this tonight |
|
Thank y'kindly sir! |
|
Oops, I completely forgot about this, sorry! I will look at it this week-end. |
|
@jonlives Hey, I'm really sorry I took so long! Can you try https://github.com/bmarini/knife-inspect/tree/submodule_bug and tell me if it fixes your issue? I haven't been able to reproduce it yet so it's a stab in the dark... |
|
@gregkare that looks like it does the trick, thanks muchly! |
|
@jonlives Perfect, I'll release a new version of the gem with that fix then |
|
Lovely stuff. |
|
I've released 0.9.0 including this fix: https://rubygems.org/gems/knife-inspect/versions/0.9.0 |
No description provided.