← Back to branch summary

~gandelman-a/ubuntu/precise/facter/merge922788

« back to all changes in this revision

Viewing changes to lib/facter/util/collection.rb

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman
  • Date: 2011-10-18 10:32:42 UTC
  • mfrom: (1.3.3 upstream)
  • mto: This revision was merged to the branch mainline in revision 16.
  • Revision ID: package-import@ubuntu.com-20111018103242-ag8i8vejfp8v7b1b
Tags: upstream-1.6.1
Import upstream version 1.6.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/facter/util/collection.rb
66
66
    def fact(name)
67
67
        name = canonize(name)
68
68
 
 
69
        # Try to load the fact if necessary
69
70
        loader.load(name) unless @facts[name]
70
71
 
71
 
        return @facts[name]
 
72
        # Try HARDER
 
73
        loader.load_all unless @facts[name]
 
74
 
 
75
        @facts[name]
72
76
    end
73
77
 
74
78
    # Flush all cached values.