From 89e3c0d78fdd35aea1341a4a0a941b43dc0c8f59 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky@fedoraproject.org>
Date: Wed, 12 May 2010 15:32:09 -0400
Subject: [PATCH] Remove useless function and clean up.

---
 scripts/puppetsearch/puppetsearch.rb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/scripts/puppetsearch/puppetsearch.rb b/scripts/puppetsearch/puppetsearch.rb
index a86866e..f2dd41c 100755
--- a/scripts/puppetsearch/puppetsearch.rb
+++ b/scripts/puppetsearch/puppetsearch.rb
@@ -3,13 +3,6 @@ require "yaml"
 require "puppet"
 require "optparse"
 
-def find_resource(catalog, type, query_file)
-  resource = catalog.resource(type, query_file)
-  unless resource.nil?
-    resource.file
-  end
-end
-
 options = {
   :types => [],
 }
@@ -53,10 +46,12 @@ end
 
 catalog = YAML::load_file(options[:yamlfile])
 
-ARGV.each do |search|
+ARGV.each do |search_title|
   options[:types].each do |type|
-    manifest = find_resource(catalog, type, search)
-    puts "#{type}[#{search}] defined in #{manifest}"
+    resource = catalog.resource(type, search_title)
+    unless resource.nil?
+      puts "#{resource} defined in #{resource.file}"
+    end
   end
 end