Fix dependency cycle check for 2.6.x

puppetlabs · Feb 26, 2013 · fd67e50 · fd67e50
1 parent 433b303
commit fd67e50
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/lib/rspec-puppet/matchers/compile.rb b/lib/rspec-puppet/matchers/compile.rb
@@ -17,13 +17,22 @@ module ManifestMatchers
         begin
           cat = catalogue.to_ral.relationship_graph
           cat.write_graph(:resources)
-          cycles = cat.find_cycles_in_graph
-          if cycles.length > 0
-            cycles.each do |cycle|
-              paths = cat.paths_in_cycle(cycle)
-              @cycles << (paths.map{ |path| '(' + path.join(" => ") + ')'}.join("\n") + "\n")
+          if cat.respond_to? :find_cycles_in_graph
+            cycles = cat.find_cycles_in_graph
+            if cycles.length > 0
+              cycles.each do |cycle|
+                paths = cat.paths_in_cycle(cycle)
+                @cycles << (paths.map{ |path| '(' + path.join(" => ") + ')'}.join("\n") + "\n")
+              end
+              retval = false
+            end
+          else
+            begin
+              cat.topsort
+            rescue Puppet::Error => e
+              @cycles = [e.message.rpartition(';').first.partition(':').last]
+              retval = false
             end
-            retval = false
           end
         rescue Puppet::Error
           retval = false