[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit e4b2aa6e48af43e83e6954d9253ef9b38d8c36ae
Author: James Turnbull <james at lovedthanlost.net>
Date:   Wed Aug 11 15:05:48 2010 +1000

    Removed legacy Trac code

diff --git a/lib/puppet/application/doc.rb b/lib/puppet/application/doc.rb
index 66aa6c8..6ebb475 100644
--- a/lib/puppet/application/doc.rb
+++ b/lib/puppet/application/doc.rb
@@ -56,7 +56,7 @@ class Puppet::Application::Doc < Puppet::Application
   end
 
   def run_command
-    return[:rdoc, :trac, :markdown].include?(options[:mode]) ? send(options[:mode]) : other
+    return[:rdoc, :markdown].include?(options[:mode]) ? send(options[:mode]) : other
   end
 
   def rdoc
@@ -72,7 +72,7 @@ class Puppet::Application::Doc < Puppet::Application
 
           Puppet.settings.setdefaults(
         "puppetdoc",
-        
+
       "document_all" => [false, "Document all resources"]
     )
     Puppet.settings[:document_all] = options[:all] || false
@@ -92,14 +92,6 @@ class Puppet::Application::Doc < Puppet::Application
     exit exit_code
   end
 
-  def trac
-    require 'puppet/util/reference'
-    options[:references].each do |name|
-      section = Puppet::Util::Reference.reference(name) or raise "Could not find section #{name}"
-      section.trac unless options[:mode] == :pdf
-    end
-  end
-
   def markdown
     text = ""
     with_contents = false
diff --git a/lib/puppet/util/reference.rb b/lib/puppet/util/reference.rb
index 62bab64..3fdd37f 100644
--- a/lib/puppet/util/reference.rb
+++ b/lib/puppet/util/reference.rb
@@ -15,7 +15,7 @@ class Puppet::Util::Reference
   end
 
   def self.modes
-    %w{pdf trac text markdown}
+    %w{pdf text markdown}
   end
 
   def self.newreference(name, options = {}, &block)
@@ -181,27 +181,4 @@ class Puppet::Util::Reference
   def to_text(withcontents = true)
     strip_trac(to_rest(withcontents))
   end
-
-  def to_trac(with_contents = true)
-    "{{{\n#!rst\n#{self.to_rest(with_contents)}\n}}}"
-  end
-
-  def trac
-    Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
-      f.puts self.to_trac
-    end
-
-    puts "Writing #{@name} reference to trac as #{@page}"
-    cmd = %{sudo trac-admin /opt/rl/trac/puppet wiki import %s /tmp/puppetdoc.txt} % self.page
-    output = %x{#{cmd}}
-    unless $CHILD_STATUS == 0
-      $stderr.puts "trac-admin failed"
-      $stderr.puts output
-      exit(1)
-    end
-    unless output =~ /^\s+/
-      $stderr.puts output
-    end
-  end
 end
-
diff --git a/tasks/rake/tracdocs.rake b/tasks/rake/tracdocs.rake
deleted file mode 100644
index d26d8fc..0000000
--- a/tasks/rake/tracdocs.rake
+++ /dev/null
@@ -1,8 +0,0 @@
-task :tracdocs do
-    require 'puppet'
-    require 'puppet/util/reference'
-    Puppet::Util::Reference.references.each do |ref|
-        sh "puppetdoc -m trac -r #{ref.to_s}"
-    end 
-end
-

-- 
Puppet packaging for Debian