summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-01-15 19:41:38 -0800
committerLuke Kanies <luke@madstop.com>2008-01-15 19:41:38 -0800
commit4165edaeb71ee2883b1bb85ff39a52d5628b259f (patch)
treeaf3392f3d72d46c279d531ff4837161260dd91d6 /lib/puppet
parentcfda651f88d12249f29706d2bedbfddce7a2e6f7 (diff)
downloadpuppet-4165edaeb71ee2883b1bb85ff39a52d5628b259f.tar.gz
puppet-4165edaeb71ee2883b1bb85ff39a52d5628b259f.tar.xz
puppet-4165edaeb71ee2883b1bb85ff39a52d5628b259f.zip
More fixes to the testing.
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/type/yumrepo.rb2
-rwxr-xr-xlib/puppet/util/filetype.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/type/yumrepo.rb b/lib/puppet/type/yumrepo.rb
index acb3b9b83..558ad7929 100644
--- a/lib/puppet/type/yumrepo.rb
+++ b/lib/puppet/type/yumrepo.rb
@@ -181,11 +181,11 @@ module Puppet
inifile.store
end
+ # This is only used during testing.
def self.clear
@inifile = nil
@yumconf = "/etc/yum.conf"
@defaultrepodir = nil
- super
end
# Return the Puppet::Util::IniConfig::Section for this yumrepo resource
diff --git a/lib/puppet/util/filetype.rb b/lib/puppet/util/filetype.rb
index cddfc4689..95f48e10e 100755
--- a/lib/puppet/util/filetype.rb
+++ b/lib/puppet/util/filetype.rb
@@ -106,6 +106,7 @@ class Puppet::Util::FileType
# Overwrite the file.
def write(text)
backup()
+ raise("Cannot create file %s in absent directory" % @path) unless FileTest.exist?(File.dirname(@path))
File.open(@path, "w") { |f| f.print text; f.flush }
end
end