From d10f2afbacbdd0cbe58c0be7c6384e98c576059b Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Thu, 26 Jan 2012 23:02:18 -0600 Subject: [PATCH] versions: silence 'aka' warning and syntax errors Signed-off-by: Jack Nagel --- Library/Homebrew/cmd/versions.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/cmd/versions.rb b/Library/Homebrew/cmd/versions.rb index 48496d99af..55703c8112 100644 --- a/Library/Homebrew/cmd/versions.rb +++ b/Library/Homebrew/cmd/versions.rb @@ -63,15 +63,21 @@ class Formula path = Pathname.new(Pathname.pwd+"#{name}.rb") path.write text_from_sha(sha) - # Unload the class so Formula#version returns the correct value. + # Determine the version by loading the old class file. # Note that this means that the command will error out after it # encounters a formula that won't import. This doesn't matter # for most formulae, but e.g. Bash at revision aae084c9db has a # syntax error and so `versions` isn't able to walk very far back # through the history. + + # Unload the class so Formula#version returns the correct value. # FIXME shouldn't have to do this? - Object.send(:remove_const, "#{Formula.class_s(name)}") - Formula.factory(path).version + Object.send(:remove_const, Formula.class_s(name)) + begin + nostdout { Formula.factory(path).version } + rescue SyntaxError + nil + end end rescue nil end end