Merge lp:~gandelman-a/ubuntu/lucid/facter/732953_fixregress into lp:ubuntu/lucid-proposed/facter

[Adam Gandelman]

Fixes a regression introduced in last SRU where timeouts are not being properly rescued.

[lp:~gandelman-a/ubuntu/lucid/facter/732953_fixregress]

14. By Adam Gandelman on 2011-11-07

debian/changelog: Update bug reference.

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-25 10:28:17 +0000
+++ debian/changelog	2011-11-07 20:28:25 +0000
@@ -1,3 +1,10 @@
+facter (1.5.6-2ubuntu2.3) lucid-proposed; urgency=low
+
+  * lib/facter/ec2.rb: Rescue condition in can_connect() when timeout()
+    actually has a chance to timeout. (LP: #885998) 
+
+ -- Adam Gandelman <[e-mail]>  Mon, 07 Nov 2011 10:18:18 -0800
+
 facter (1.5.6-2ubuntu2.2) lucid-proposed; urgency=low
 
   * lib/facter/ec2.rb: Properly handle ip+port when testing connectivity

=== modified file 'lib/facter/ec2.rb'
--- lib/facter/ec2.rb	2011-10-25 10:28:17 +0000
+++ lib/facter/ec2.rb	2011-11-07 20:28:25 +0000
@@ -9,7 +9,9 @@
  url = "http://#{ip}:#{port}"
  Timeout::timeout(wait_sec) {open(url)}
  return true
-rescue
+ rescue Timeout::Error
+  return false
+ rescue
   return false
 end