[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

Markus Roberts Markus at reality.com
Wed Jul 14 10:35:31 UTC 2010


The following commit has been merged in the upstream branch:
commit d62a391695bd68464ba7345616cc1e7686f8f735
Author: Markus Roberts <Markus at reality.com>
Date:   Sun Jun 27 10:49:29 2010 -0700

    Breaking require-loop
    
    Merging some of the branches creates a require-loop; this commit breaks it by
    removing the most recently added link (which I believe to have been unneeded /
    unrelated to the patch in which it snuck in).

diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb
index c82491d..f0693f9 100644
--- a/lib/puppet/application/agent.rb
+++ b/lib/puppet/application/agent.rb
@@ -1,4 +1,3 @@
-require 'puppet'
 require 'puppet/application'
 
 class Puppet::Application::Agent < Puppet::Application

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list