Merge branch 'upstream' into debian/sid

1 files changed, 21 insertions, 21 deletions

diff --git a/sisu-install b/sisu-install
index 3d78c6c1..2b981b94 100755
--- a/sisu-install
+++ b/sisu-install
@@ -631,28 +631,28 @@ module Rant
             @items.unshift(entry) if entry !~ ignore_rx
             self
         end
-if Object.method_defined?(:fcall) || Object.method_defined?(:funcall) # in Ruby 1.9 like __send__
-        @@__send_private__ = Object.method_defined?(:fcall) ? :fcall : :funcall
-        def resolve
-            @pending = false
-            @actions.each{ |action| self.__send__(@@__send_private__, *action) }.clear
-            ix = ignore_rx
-            if ix
-                @items.reject! { |f| f =~ ix && !@keep[f] }
-            end
-            self
-        end
-else
-        def resolve
-            @pending = false
-            @actions.each{ |action| self.__send__(*action) }.clear
-            ix = ignore_rx
-            if ix
-                @items.reject! { |f| f =~ ix && !@keep[f] }
-            end
-            self
+        if Object.method_defined?(:fcall) || Object.method_defined?(:funcall) # in Ruby 1.9 like __send__
+          @@__send_private__ = Object.method_defined?(:fcall) ? :fcall : :funcall
+          def resolve
+              @pending = false
+              @actions.each{ |action| self.__send__(@@__send_private__, *action) }.clear
+              ix = ignore_rx
+              if ix
+                  @items.reject! { |f| f =~ ix && !@keep[f] }
+              end
+              self
+          end
+        else
+          def resolve
+              @pending = false
+              @actions.each{ |action| self.__send__(*action) }.clear
+              ix = ignore_rx
+              if ix
+                  @items.reject! { |f| f =~ ix && !@keep[f] }
+              end
+              self
+          end
         end
-end
         def include(*pats)
             @def_glob_dotfiles ? glob_all(*pats) : glob_unix(*pats)
         end