diff options
| author | sersut <serdar@opscode.com> | 2013-05-20 16:04:41 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2013-05-20 16:04:41 -0700 |
| commit | 949715f2e10925ea79d5645078fcb3b4bfd225da (patch) | |
| tree | 9adc18232a136120985c5ebbed511f06d895f2ac /lib | |
| parent | 669bb5913611ebe4838afee4c120d0006d289646 (diff) | |
| download | chef-949715f2e10925ea79d5645078fcb3b4bfd225da.tar.gz | |
Fix comments that include FIXME / TODO / XXX.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/chef/file_access_control/unix.rb | 4 | ||||
| -rw-r--r-- | lib/chef/provider/file.rb | 7 | ||||
| -rw-r--r-- | lib/chef/util/diff.rb | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/lib/chef/file_access_control/unix.rb b/lib/chef/file_access_control/unix.rb index db161e24e4..d8c51b4b3b 100644 --- a/lib/chef/file_access_control/unix.rb +++ b/lib/chef/file_access_control/unix.rb @@ -104,7 +104,7 @@ class Chef gid_from_resource(current_resource) end - def gid_from_resource(resource) # XXX: masking instance variable + def gid_from_resource(resource) return nil if resource == nil or resource.group.nil? if resource.group.kind_of?(String) diminished_radix_complement( Etc.getgrnam(resource.group).gid ) @@ -245,7 +245,7 @@ class Chef end end - def uid_from_resource(resource) # XXX: masking instance variable + def uid_from_resource(resource) return nil if resource == nil or resource.owner.nil? if resource.owner.kind_of?(String) diminished_radix_complement( Etc.getpwnam(resource.owner).uid ) diff --git a/lib/chef/provider/file.rb b/lib/chef/provider/file.rb index 221cb9fe5e..ff31c2a8e2 100644 --- a/lib/chef/provider/file.rb +++ b/lib/chef/provider/file.rb @@ -288,9 +288,10 @@ class Chef def load_resource_attributes_from_file(resource) if Chef::Platform.windows? - # TODO: To work around CHEF-3554, add support for Windows - # equivalent, or implicit resource reporting won't work for - # Windows. + # This is a work around for CHEF-3554. + # OC-6534: is tracking the real fix for this workaround. + # Add support for Windows equivalent, or implicit resource + # reporting won't work for Windows. return end acl_scanner = ScanAccessControl.new(@new_resource, resource) diff --git a/lib/chef/util/diff.rb b/lib/chef/util/diff.rb index 1151722af8..9431939793 100644 --- a/lib/chef/util/diff.rb +++ b/lib/chef/util/diff.rb @@ -94,7 +94,8 @@ class Chef else @diff = result.stdout.split("\n") @diff.delete("\\ No newline at end of file") - # XXX: successful return of the diff is here, we return nil as no error... ugh... + # Successful return of the diff. + # We return nil as no error... return nil end elsif not result.stderr.empty? |