[SCM] ladish/master: Small fix

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 04e18e264c22a4fd3ab22e5f68a0318d28b065c1
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 12 13:16:37 2011 +0200

    Small fix

diff --git a/debian/patches/1004-in_terminal_execution.patch b/debian/patches/1004-in_terminal_execution.patch
index 0f2c456..6e856d4 100644
--- a/debian/patches/1004-in_terminal_execution.patch
+++ b/debian/patches/1004-in_terminal_execution.patch
@@ -13,7 +13,7 @@ Bug-Debian: http://bugs.debian.org/626481
    }
  
 -  if (!run_in_terminal || strchr(commandline, '$') != NULL)
-+  if (!run_in_terminal || 1) != NULL) /* -e expects an executable not a shell command */
++  if (!run_in_terminal || 1) /* -e expects an executable not a shell command */
    {
      if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i))
      {

-- 
ladish packaging