[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit c65f2b50832c2772861298c469813c09d25fefd3
Author: James Turnbull <james at lovedthanlost.net>
Date:   Tue Nov 18 20:22:45 2008 +1100

    Fixed #1668 - puppetca can't clean unsigned certs

diff --git a/CHANGELOG b/CHANGELOG
index 4d50a6c..4cf39b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,8 @@
     whether stderr and stdout are combined in the output
     
     Added versionable feature to the RPM provider
+    
+    Fixed #1668 - puppetca can't clean unsigned certs
 
     Moved RRD feature from util/metric.rb to feature/base.rb
 
diff --git a/bin/puppetca b/bin/puppetca
index 84c1599..7c88aba 100755
--- a/bin/puppetca
+++ b/bin/puppetca
@@ -236,11 +236,12 @@ when :clean
         cleaned = true
     else
         hosts.each do |host|
-            cert = ca.getclientcert(host)[0]
-                if cert.nil?
-                    $stderr.puts "Could not find client certificate for %s" % host
-                    next
-                end
+          
+            unless cert = ca.getclientcert(host)[0] || ca.getclientcsr(host)
+                $stderr.puts "Could not find client certificate or request for %s" % host
+                next
+            end           
+            
             ca.clean(host)
             cleaned = true
         end

-- 
Puppet packaging for Debian