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

[Adam Gandelman]

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

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

17. By Adam Gandelman on 2011-11-07

debian/changelog: Update bug reference.

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-20 10:40:35 +0000
+++ debian/changelog	2011-11-07 20:30:29 +0000
@@ -1,3 +1,11 @@
+facter (1.5.8-2ubuntu2.2) natty-proposed; urgency=low
+
+  * debian/patches/fix_ec2_metadata_facts.patch: Refreshed to rescue condition
+    in can_connect() when timeout() actually has a chance to timeout. 
+    (LP: #885998)
+
+ -- Adam Gandelman <[e-mail]>  Mon, 07 Nov 2011 10:47:01 -0800
+
 facter (1.5.8-2ubuntu2.1) natty-proposed; urgency=low
 
   * debian/patches/reload_all_facts.patch: Reload all facts if the

=== modified file 'debian/patches/fix_ec2_metadata_facts.patch'
--- debian/patches/fix_ec2_metadata_facts.patch	2011-10-20 10:40:35 +0000
+++ debian/patches/fix_ec2_metadata_facts.patch	2011-11-07 20:30:29 +0000
@@ -8,9 +8,9 @@
 
 Index: facter/lib/facter/ec2.rb
 ===================================================================
---- facter.orig/lib/facter/ec2.rb	2011-10-18 18:47:15.469068474 -0700
-+++ facter/lib/facter/ec2.rb	2011-10-18 18:49:57.797076713 -0700
-@@ -6,7 +6,8 @@
+--- facter.orig/lib/facter/ec2.rb	2011-11-07 10:41:18.347998025 -0800
++++ facter/lib/facter/ec2.rb	2011-11-07 10:41:50.335999406 -0800
+@@ -6,9 +6,12 @@
  require 'timeout'
  
  def can_connect?(ip,port,wait_sec=2)
@@ -18,5 +18,10 @@
 + url = "http://#{ip}:#{port}"
 + Timeout::timeout(wait_sec) {open(url)}
   return true
- rescue
+-rescue
++ rescue Timeout::Error
++  return false
++ rescue
    return false
+ end
+ 

=== modified file 'lib/facter/ec2.rb'
--- lib/facter/ec2.rb	2011-10-20 10:40:35 +0000
+++ lib/facter/ec2.rb	2011-11-07 20:30:29 +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