[Debian-olpc-devel] [SCM] sugar Debian packaging branch, master, updated. debian/0.96.1-2-4-g5d8ab6a

Simon Paillard spaillard at debian.org
Wed Oct 31 20:13:01 UTC 2012


The following commit has been merged in the master branch:
commit 54bf912df198a3267462de724ef98a6fa61f8dec
Author: Simon Paillard <spaillard at debian.org>
Date:   Fri Oct 5 23:56:32 2012 +0200

    Fix shell test syntax for /u/b/sugar
    
    From #678720 log:
    > /usr/bin/sugar: 3: [: missing ]
    > /usr/bin/sugar: 3: /usr/bin/sugar: 1000: not found

diff --git a/debian/patches/fix_shell_posix_and_quoting.patch b/debian/patches/fix_shell_posix_and_quoting.patch
index e28037e..2c577fc 100644
--- a/debian/patches/fix_shell_posix_and_quoting.patch
+++ b/debian/patches/fix_shell_posix_and_quoting.patch
@@ -18,7 +18,7 @@ index 12098db..feea2cf 100644
  #!/bin/sh
  
 -if [ "$(id -u)" -eq 0 -o "$(id -ru)" -eq 0 ] ; then
-+if [ "$(id -u)" -eq 0 || "$(id -ru)" -eq 0 ] ; then
++if [ "$(id -u)" -eq 0 ] || [ "$(id -ru)" -eq 0 ] ; then
  	echo Refusing to run as root.
  	exit 3
  fi

-- 
sugar Debian packaging



More information about the Debian-olpc-devel mailing list