← Back to branch summary

~nvalcarcel/ubuntu/lucid/puppet/fix-546677

« back to all changes in this revision

Viewing changes to lib/puppet/provider/host/parsed.rb

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-12-23 00:48:10 UTC
  • mfrom: (1.1.10 upstream) (3.1.7 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091223004810-3i4oryds922g5n59
Tags: 0.25.1-3ubuntu1
* Merge from debian testing.  Remaining changes:
  - debian/rules:
    + Don't start puppet when first installing puppet.
  - debian/puppet.conf, lib/puppet/defaults.rb:
    + Move templates to /etc/puppet
  - lib/puppet/defaults.rb:
    + Fix /var/lib/puppet/state ownership.
  - man/man8/puppet.conf.8: 
    + Fix broken URL in manpage.
  - debian/control:
    + Update maintainer accordint to spec.
    + Puppetmaster Recommends -> Suggests
    + Created puppet-testsuite as a seperate. Allow the users to run puppet's 
      testsuite.
  - tests/Rakefile: Fix rakefile so that the testsuite can acutally be ran.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/puppet/provider/host/parsed.rb
2
2
 
3
3
hosts = nil
4
4
case Facter.value(:operatingsystem)
5
 
when "Solaris": hosts = "/etc/inet/hosts"
 
5
when "Solaris"; hosts = "/etc/inet/hosts"
6
6
else
7
7
    hosts = "/etc/hosts"
8
8
end
14
14
) do
15
15
    confine :exists => hosts
16
16
 
17
 
    text_line :comment, :match => /^#/ 
18
 
    text_line :blank, :match => /^\s*$/ 
 
17
    text_line :comment, :match => /^#/
 
18
    text_line :blank, :match => /^\s*$/
19
19
 
20
20
    record_line :parsed, :fields => %w{ip name alias},
21
21
        :optional => %w{alias},