diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-06-18 21:03:18 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-06-18 21:03:18 +0000 |
| commit | 099bf6c582b8e68263f25c0430fcf3d5ac7b1b7f (patch) | |
| tree | 34ac81add7aeb9cd48ac599a02255d15218d6e13 /lib | |
| parent | f96ec6d7ab9d18d2068f388508d811c39973df1e (diff) | |
| download | puppet-099bf6c582b8e68263f25c0430fcf3d5ac7b1b7f.tar.gz puppet-099bf6c582b8e68263f25c0430fcf3d5ac7b1b7f.tar.xz puppet-099bf6c582b8e68263f25c0430fcf3d5ac7b1b7f.zip | |
Fixing some failing tests.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2616 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/network/handler/master.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/rails/host.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb index 50c988917..e889c1ba8 100644 --- a/lib/puppet/network/handler/master.rb +++ b/lib/puppet/network/handler/master.rb @@ -71,7 +71,7 @@ class Puppet::Network::Handler host = Puppet::Rails::Host.find_or_create_by_name(client) host.last_freshcheck = Time.now - if clientip and (! host.ip or host.ip == "") + if clientip and (! host.ip or host.ip == "" or host.ip == "NULL") host.ip = clientip end host.save diff --git a/lib/puppet/rails/host.rb b/lib/puppet/rails/host.rb index cd60a2b4b..ca1e10c93 100644 --- a/lib/puppet/rails/host.rb +++ b/lib/puppet/rails/host.rb @@ -95,6 +95,7 @@ class Puppet::Rails::Host < ActiveRecord::Base ar_hash_merge(get_facts_hash(), facts, :create => Proc.new { |name, values| fact_name = Puppet::Rails::FactName.find_or_create_by_name(name) + values = [values] unless values.is_a?(Array) values.each do |value| fact_values.build(:value => value, :fact_name => fact_name) |