← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/puppet/util/provider_features.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/util/provider_features.rb
14
14
 
15
15
        # Are all of the requirements met?
16
16
        def available?(obj)
17
 
            if self.methods 
 
17
            if self.methods
18
18
                if methods_available?(obj)
19
19
                    return true
20
20
                else
126
126
            # Create a method that will list all functional features.
127
127
            @feature_module.send(:define_method, :features) do
128
128
                return false unless defined?(features)
129
 
                features.keys.find_all { |n| feature?(n) }.sort { |a,b| 
130
 
                    a.to_s <=> b.to_s 
 
129
                features.keys.find_all { |n| feature?(n) }.sort { |a,b|
 
130
                    a.to_s <=> b.to_s
131
131
                }
132
132
            end
133
133