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

« back to all changes in this revision

Viewing changes to lib/puppet/provider/package/fink.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:
3
3
    include Puppet::Util::Package
4
4
 
5
5
    desc "Package management via ``fink``."
6
 
    
 
6
 
7
7
    commands :fink => "/sw/bin/fink"
8
8
    commands :aptget => "/sw/bin/apt-get"
9
9
    commands :aptcache => "/sw/bin/apt-cache"
40
40
        keep = ""
41
41
 
42
42
        cmd << :install << str
43
 
        
 
43
 
44
44
        finkcmd(cmd)
45
45
    end
46
46
 
56
56
                end
57
57
                end
58
58
 
59
 
        #
60
 
        # preseeds answers to dpkg-set-selection from the "responsefile"
61
 
        #
 
59
    #
 
60
    # preseeds answers to dpkg-set-selection from the "responsefile"
 
61
    #
62
62
    def run_preseed
63
63
        if response = @resource[:responsefile] and FileTest.exists?(response)
64
64
            self.info("Preseeding %s to debconf-set-selections" % response)
65
65
 
66
66
            preseed response
67
 
        else 
 
67
        else
68
68
            self.info "No responsefile specified or non existant, not preseeding anything"
69
69
        end
70
70
    end