[DRE-commits] r2030 - packages/libcommandline-ruby/trunk/debian/patches

[zoso at alioth.debian.org]

Author: zoso
Date: 2007-11-04 22:03:53 +0000 (Sun, 04 Nov 2007)
New Revision: 2030

Modified:
   packages/libcommandline-ruby/trunk/debian/patches/001-fix_columns_env_variable.patch
Log:
* Fix patch for COLUMNS environment variable problem


Modified: packages/libcommandline-ruby/trunk/debian/patches/001-fix_columns_env_variable.patch
===================================================================
--- packages/libcommandline-ruby/trunk/debian/patches/001-fix_columns_env_variable.patch	2007-11-04 18:16:41 UTC (rev 2029)
+++ packages/libcommandline-ruby/trunk/debian/patches/001-fix_columns_env_variable.patch	2007-11-04 22:03:53 UTC (rev 2030)
@@ -1,11 +1,6 @@
---- lib/commandline/application.rb.orig	2007-10-26 00:20:34.000000000 +0200
-+++ lib/commandline/application.rb	2007-10-26 00:10:51.000000000 +0200
-@@ -335,7 +335,7 @@
-     #
-     # Formatting defaults
-     #
--    console_width = ENV["COLUMNS"]
-+    console_width = ENV["COLUMNS"].to_i
-     @columns = 
-       if console_width.nil?
-         DEFAULT_CONSOLE_WIDTH
+173d172
+<     f = Text::Format.new
+338c337
+<     console_width = ENV["COLUMNS"]
+---
+>     console_width = ENV["COLUMNS"].nil? ? nil : (Integer(ENV["COLUMNS"]) rescue ArgumentError nil)