summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
author(no author) <(no author)@980ebf18-57e1-0310-9a29-db15c13687c0>2007-08-09 07:56:22 +0000
committer(no author) <(no author)@980ebf18-57e1-0310-9a29-db15c13687c0>2007-08-09 07:56:22 +0000
commit5e8d71da3e060036c695a2db904c880567fc9f69 (patch)
tree440ae8c7aa72d32f35a97978fb41050853623415 /lib/puppet
parent9530df1d8c3b89404fd7b6eba7bd740dfb464b55 (diff)
downloadpuppet-5e8d71da3e060036c695a2db904c880567fc9f69.tar.gz
puppet-5e8d71da3e060036c695a2db904c880567fc9f69.tar.xz
puppet-5e8d71da3e060036c695a2db904c880567fc9f69.zip
Fix the ral:providers:host:parsed tests so they run successfully
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2757 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet')
-rwxr-xr-xlib/puppet/provider/parsedfile.rb2
-rwxr-xr-xlib/puppet/util/filetype.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/provider/parsedfile.rb b/lib/puppet/provider/parsedfile.rb
index 6cac275cf..338694fff 100755
--- a/lib/puppet/provider/parsedfile.rb
+++ b/lib/puppet/provider/parsedfile.rb
@@ -356,7 +356,7 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
if defined? @resource and restarget = @resource.should(:target) and restarget != @property_hash[:target]
self.class.modified(restarget)
end
- if @property_hash[:target] != :absent
+ if @property_hash[:target] != :absent and @property_hash[:target]
self.class.modified(@property_hash[:target])
end
end
diff --git a/lib/puppet/util/filetype.rb b/lib/puppet/util/filetype.rb
index 7ce732b63..4fd646331 100755
--- a/lib/puppet/util/filetype.rb
+++ b/lib/puppet/util/filetype.rb
@@ -78,6 +78,7 @@ class Puppet::Util::FileType
end
def initialize(path)
+ raise ArgumentError.new("Path is nil") if path.nil?
@path = path
end