[Fakeroot-commits] [SCM] fakeroot branch, master, updated. debian/1.11.4

[Clint Adams]

The following commit has been merged in the master branch:
commit aa8e41a78794fe5c1df3fea412759ce097010803
Author: Akim Demaille <demaille at gostai.com>
Date:   Mon Dec 15 16:36:48 2008 +0100

    Use functions in scripts.
    
    	* scripts/fakeroot.in (stderr, fatal): New, use them.

diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
index d66c54a..b969544 100755
--- a/scripts/fakeroot.in
+++ b/scripts/fakeroot.in
@@ -14,6 +14,20 @@ EOF
   exit 1
 }
 
+stderr ()
+{
+  local i
+  for i
+  do
+      echo >&2 "fakeroot: $i"
+  done
+}
+
+fatal ()
+{
+  stderr "$@"
+  exit 1
+}
 
 # strip /bin/fakeroot to find install prefix
 PREFIX=@prefix@
@@ -66,7 +80,7 @@ while test "X$1" != "X--"; do
          FAKEDOPTS=$FAKEDOPTS" --load"
          PIPEIN="<$1"
        else
-         echo 1>&2 "fakeroot: database file \`$1' does not exist."
+         stderr "database file \`$1' does not exist."
        fi
        ;;
     -s)
@@ -117,15 +131,13 @@ fi
 
 if test $libfound = no
 then
-    echo >&2 "fakeroot: preload library \`$LIB' not found, aborting."
-    exit 1
+    fatal "preload library \`$LIB' not found, aborting."
 fi
 
 if test -n "$FAKEROOTKEY"
 then
-    echo >&2 "fakeroot: FAKEROOTKEY set to $FAKEROOTKEY"
-    echo >&2 "fakeroot: nested operation not yet supported"
-    exit 1
+    fatal "FAKEROOTKEY set to $FAKEROOTKEY" \
+          "nested operation not yet supported"
 fi
 
 unset FAKEROOTKEY
@@ -140,8 +152,7 @@ else
 fi
 
 if test -z "$FAKEROOTKEY" || test -z "$PID"; then
-  echo >&2 "fakeroot: error while starting the \`faked' daemon."
-  exit 1
+  fatal "error while starting the \`faked' daemon."
 fi
 
 if test $USEABSLIBPATH -ne 0 ; then

-- 
fakeroot