diff options
| author | Luke Kanies <luke@madstop.com> | 2009-04-02 19:41:17 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2009-04-02 19:41:17 -0500 |
| commit | a677e26eb1452c08d7724047a18e50f4a654d2cd (patch) | |
| tree | 1a615f93e0504527db08ff29bd71e7d754228747 /lib | |
| parent | e016307f00fe67dc53f8581f08c1dfb5ab7dfb3b (diff) | |
| download | puppet-a677e26eb1452c08d7724047a18e50f4a654d2cd.tar.gz puppet-a677e26eb1452c08d7724047a18e50f4a654d2cd.tar.xz puppet-a677e26eb1452c08d7724047a18e50f4a654d2cd.zip | |
Fixing all tests that were apparently broken in the 0.24.x merge.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/parser/resource/reference.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/util/selinux.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/resource/reference.rb b/lib/puppet/parser/resource/reference.rb index cf7e997d8..0c28cf0df 100644 --- a/lib/puppet/parser/resource/reference.rb +++ b/lib/puppet/parser/resource/reference.rb @@ -1,5 +1,5 @@ # A reference to a resource. Mostly just the type and title. -require 'puppet/resource_reference' +require 'puppet/resource/reference' require 'puppet/file_collection/lookup' # A reference to a resource. Mostly just the type and title. diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb index cd3b2ac1a..f13600680 100644 --- a/lib/puppet/util/selinux.rb +++ b/lib/puppet/util/selinux.rb @@ -153,7 +153,7 @@ module Puppet::Util::SELinux # Internal helper function to read and parse /proc/mounts def read_mounts begin - mountfh = File.open("/proc/mounts", NONBLOCK) + mountfh = File.open("/proc/mounts", File::NONBLOCK) mounts = mountfh.read mountfh.close rescue |