Don't print ERROR when we're supposed to exit normally

dstrelau · Feb 23, 2011 · 287e263 · 287e263
1 parent 182e4ab
commit 287e263
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/History.txt b/History.txt
@@ -1,3 +1,8 @@
+=== 1.2.2 / 2011-02-22
+
+* Bug Fix
+  * Don't print ERROR when we're exiting normally.
+
 === 1.2.1 / 2011-02-22
 
 * Bug Fix

diff --git a/lib/meme.rb b/lib/meme.rb
@@ -16,7 +16,7 @@ class Error < RuntimeError; end
   ##
   # Every meme generator needs a version
 
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 
   ##
   # For statistics!
@@ -87,6 +87,10 @@ def self.run argv = ARGV
 
     puts link
     link
+  rescue Interrupt
+    exit
+  rescue SystemExit
+    raise
   rescue Exception => e
     abort "ERROR: #{e.message} (#{e.class})"
   end