Merge lp:~gandelman-a/ubuntu/lucid/facter/lp732953_876130 into lp:ubuntu/lucid-updates/facter

[Adam Gandelman]

Rebased a previous MP on lucid-updates. Properly versioned and applied patches as per feedback from James Page on original MP:

A few comments that need resolution before we can upload:

1) The branch is currently based on 1.5.6-2ubuntu2 from the lucid release pocket; it needs to be based on 1.5.6-2ubuntu2.1 from lucid-updates - this is why the merge shows a conflict in debian/changelog

2) This package in Lucid uses an earlier version of debhelper and is source format 1.0; so patches don't get automatically applied. The correct course of action (as one patch has already be directly applied in 1.5.6-2ubuntu2.1) is to directly apply the patches to the upstream source tree. Ugly but its the most minimal change for the SRU and does not impact the update that has already been made

[Luke Yelavich (themuso)]

Uploaded, thanks for your work.

review: Approve

Unmerged revisions

14. By Adam Gandelman on 2011-10-25

Fix series

13. By Adam Gandelman on 2011-10-25

lib/facter/util/collection.rb: Backported fix from upstream commit
2255abee7bdb9b6478ca228546e3d275dbac0ec3. Reload all facts if the
requested fact is not found. Ensures consistency after facts
have been cleared. (LP: #876130)

12. By Adam Gandelman on 2011-10-25

lib/facter/ec2.rb: Properly handle ip+port when testing connectivity
of ec2 metadata service.(LP: #732953)

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-26 21:36:23 +0000
+++ debian/changelog	2011-10-25 17:40:30 +0000
@@ -1,3 +1,14 @@
+facter (1.5.6-2ubuntu2.2) lucid-proposed; urgency=low
+
+  * lib/facter/ec2.rb: Properly handle ip+port when testing connectivity
+    of ec2 metadata service.(LP: #732953)
+  * lib/facter/util/collection.rb: Backported fix from upstream commit
+    2255abee7bdb9b6478ca228546e3d275dbac0ec3. Reload all facts if the
+    requested fact is not found.  Ensures consistency after facts
+    have been cleared. (LP: #876130)
+
+ -- Adam Gandelman <[e-mail]>  Tue, 25 Oct 2011 10:28:17 -0700
+
 facter (1.5.6-2ubuntu2.1) lucid-proposed; urgency=low
 
   * Cherry-picked KVM detection for 'virtual' fact from upstream commit
 
=== modified file 'lib/facter/ec2.rb'
--- lib/facter/ec2.rb	2009-06-30 00:21:23 +0000
+++ lib/facter/ec2.rb	2011-10-25 17:40:30 +0000
@@ -6,7 +6,8 @@
 require 'timeout'
 
 def can_connect?(ip,port,wait_sec=2)
- Timeout::timeout(wait_sec) {open(ip, port)}
+ url = "http://#{ip}:#{port}"
+ Timeout::timeout(wait_sec) {open(url)}
  return true
 rescue
   return false
 
=== modified file 'lib/facter/util/collection.rb'
--- lib/facter/util/collection.rb	2008-09-03 09:06:56 +0000
+++ lib/facter/util/collection.rb	2011-10-25 17:40:30 +0000
@@ -66,9 +66,13 @@
     def fact(name)
         name = canonize(name)
 
+        # Try to load the fact if necessary
         loader.load(name) unless @facts[name]
 
-        return @facts[name]
+        # Try HARDER
+        loader.load_all unless @facts[name]
+
+        @facts[name]
     end
 
     # Flush all cached values.