← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/puppet/provider/selmodule/semodule.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/selmodule/semodule.rb
45
45
        end
46
46
        return :false
47
47
    end
48
 
    
 
48
 
49
49
    def syncversion= (dosync)
50
50
        begin
51
51
            execoutput("#{command(:semodule)} --upgrade #{selmod_name_to_filename}")
115
115
 
116
116
        # At last!  the version
117
117
 
118
 
        v = selmod_readnext(mod) 
 
118
        v = selmod_readnext(mod)
119
119
 
120
120
        self.debug "file version #{v}"
121
121
        return v
122
122
    end
123
123
 
124
 
    def selmodversion_loaded 
 
124
    def selmodversion_loaded
125
125
        lines = ()
126
126
        begin
127
127
            execpipe("#{command(:semodule)} --list") do |output|