Merge branch 'ohai-150' of git://github.com/mdkent/ohai into mdkent/o…

…hai-150
anshul · Jan 28, 2010 · 3502430 · 3502430
2 parents 08bb50a + 4d5a6ed
commit 3502430
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/ohai/system.rb b/lib/ohai/system.rb
@@ -72,7 +72,7 @@ def set(name, *value)
 
     def from(cmd)
       status, stdout, stderr = run_command(:command => cmd)
-      return "" if stdout.nil?
+      return "" if stdout.nil? || stdout.empty?
       stdout.chomp!.strip
     end
 
@@ -96,7 +96,7 @@ def provides(*paths)
     def from_with_regex(cmd, *regex_list)
       regex_list.flatten.each do |regex|
         status, stdout, stderr = run_command(:command => cmd)
-        return "" if stdout.nil?
+        return "" if stdout.nil? || stdout.empty?
         stdout.chomp!.strip
         md = stdout.match(regex)
         return md[1]