← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/puppet/oneiric-security

« back to all changes in this revision

Viewing changes to lib/puppet/provider/package/freebsd.rb

  • Committer: Bazaar Package Importer
  • Author(s): Micah Anderson
  • Date: 2008-07-26 15:43:45 UTC
  • mfrom: (1.1.8 upstream) (3.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080726154345-c03m49twzxewdwjn
Tags: 0.24.5-2
* Fix puppetlast to work with 0.24.5
* Adjust logcheck to match against new log messages in 0.24.5
* Update standards version to 3.8.0 (no changes)
* Update changelog to reduce length of line to make lintian happy

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/puppet/provider/package/freebsd.rb
18
18
    def install
19
19
        should = @resource.should(:ensure)
20
20
 
21
 
        if @resource[:source]
22
 
            return super
 
21
        if @resource[:source] =~ /\/$/
 
22
            if @resource[:source] =~ /^(ftp|https?):/
 
23
                withenv :PACKAGESITE => @resource[:source] do
 
24
                    pkgadd "-r", @resource[:name]
 
25
                end
 
26
            else
 
27
                withenv :PKG_PATH => @resource[:source] do
 
28
                    pkgadd @resource[:name]
 
29
                end
 
30
            end
 
31
        else
 
32
            if @resource[:source]
 
33
                Puppet.warning "source is defined but does not have trailing slash, ignoring %s" % @resource[:source]
 
34
            end
 
35
            pkgadd "-r", @resource[:name]
23
36
        end
24
 
 
25
 
        pkgadd "-r", @resource[:name]
26
37
    end
27
38
 
28
39
    def query