← Back to branch summary

~ubuntu-branches/ubuntu/maverick/puppet/maverick-updates

« back to all changes in this revision

Viewing changes to lib/puppet/application/queue.rb

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug, Mathias Gug, Stig Sandbeck Mathisen
  • Date: 2010-09-07 10:44:22 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20100907104422-lmhcy8xdjcuem645
Tags: 2.6.1~rc4-0ubuntu1
http://bugs.debian.org/594575
[ Mathias Gug ]
* New upstream version:
  - Fix "Puppet standalone broken" (Closes: #594575)
* test/lib/puppettest/fakes.rb: Fix puppettest to use puppet system 
  library.

[ Stig Sandbeck Mathisen ]
* Fix "require" path for puppet queue.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/puppet/application/queue.rb
38
38
  option("--verbose","-v")
39
39
 
40
40
  def main
41
 
    require 'lib/puppet/indirector/catalog/queue' # provides Puppet::Indirector::Queue.subscribe
 
41
    require 'puppet/indirector/catalog/queue' # provides Puppet::Indirector::Queue.subscribe
42
42
    Puppet.notice "Starting puppetqd #{Puppet.version}"
43
43
    Puppet::Resource::Catalog::Queue.subscribe do |catalog|
44
44
      # Once you have a Puppet::Resource::Catalog instance, calling save on it should suffice