[DRE-commits] [SCM] rdtool.git branch, master, updated. upstream/0.6.22-28-gf8749af

[Taku YASUI]

The following commit has been merged in the master branch:
commit 11eb54a5693e5df9be9e9827e2bf62c82c685572
Author: Taku YASUI <tach at debian.org>
Date:   Sat May 5 21:32:14 2012 +0900

    Fix Error handling

diff --git a/debian/patches/010_change_dot_rd2rc_path b/debian/patches/010_change_dot_rd2rc_path
index 354440f..c7704fc 100644
--- a/debian/patches/010_change_dot_rd2rc_path
+++ b/debian/patches/010_change_dot_rd2rc_path
@@ -1,6 +1,6 @@
 --- a/bin/rd2
 +++ b/bin/rd2
-@@ -77,8 +77,8 @@
+@@ -77,10 +77,10 @@
      load "~/.rd2rc"
      #  STDERR << "#{$0}: loading ~/.rd2rc\n"
    else
@@ -9,5 +9,8 @@
 +    load "/etc/rdtool/rd2rc"
 +    #  STDERR << "#{$0}: loading /etc/rdtool/rd2rc\n"
    end
- rescue
+-rescue
++rescue LoadError
    load "rd/dot.rd2rc"
+ end
+ 

-- 
rdtool.git