From 93b4a131d025c409d2a1d95f819487173c2bb766 Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Sat, 25 Feb 2012 12:04:36 -0800 Subject: [PATCH] Only call patches once --- Library/Homebrew/formula.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index fe9598b25a..f1f6607e21 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -586,13 +586,17 @@ EOF end def patch - return if patches.nil? + # Only call `patches` once. + # If there is code in `patches`, which is not recommended, we only + # want to run that code once. + the_patches = patches + return if the_patches.nil? - if not patches.kind_of? Hash + if not the_patches.kind_of? Hash # We assume -p1 - patch_defns = { :p1 => patches } + patch_defns = { :p1 => the_patches } else - patch_defns = patches + patch_defns = the_patches end patch_list=[]