[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-212-g8852aa2

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  8852aa2642d52da00d0ada7774f57496f8fd6ab9 (commit)
      from  a2b4ab26dd260b7dadc35ac43cef968b2cd5d55f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit 8852aa2642d52da00d0ada7774f57496f8fd6ab9
Author: Giuseppe Scrivano <address@hidden>
Date:   Mon May 3 22:30:21 2010 +0200

    Update the bootstrap script

diff --git a/myserver/bootstrap b/myserver/bootstrap
index b52bb00..a9a778a 100755
--- a/myserver/bootstrap
+++ b/myserver/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-02-24.17; # UTC
+scriptversion=2010-04-30.16; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -240,6 +240,11 @@ do
   esac
 done
 
+if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
+  echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
+  exit 1
+fi
+
 # If $STR is not already on a line by itself in $FILE, insert it,
 # sorting the new contents of the file and replacing $FILE with the result.
 insert_sorted_if_absent() {
@@ -404,9 +409,6 @@ git_modules_config () {
 }
 
 gnulib_path=`git_modules_config submodule.gnulib.path`
-if test -z $gnulib_path ; then
-    gnulib_path="gnulib"
-fi
 
 # Get gnulib files.
 
@@ -422,13 +424,12 @@ case ${GNULIB_SRCDIR--} in
 
     trap cleanup_gnulib 1 2 13 15
 
-    git clone --help|grep depth > /dev/null && shallow='--depth 2' || shallow=
+    git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow=
     git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
       cleanup_gnulib
 
     trap - 1 2 13 15
   fi
-
   GNULIB_SRCDIR=$gnulib_path
   ;;
 *)
@@ -436,7 +437,7 @@ case ${GNULIB_SRCDIR--} in
   if test -d "$GNULIB_SRCDIR"/.git && \
         git_modules_config submodule.gnulib.url >/dev/null; then
     echo "$0: getting gnulib files..."
-    if git submodule --help|grep reference > /dev/null; then
+    if git submodule -h|grep -- --reference > /dev/null; then
       # Prefer the one-liner available in git 1.6.4 or newer.
       git submodule update --init --reference "$GNULIB_SRCDIR" \
         "$gnulib_path" || exit $?
@@ -487,7 +488,7 @@ update_po_files() {
   test -d $ref_po_dir || mkdir $ref_po_dir || return
   download_po_files $ref_po_dir $domain \
     && ls "$ref_po_dir"/*.po 2>/dev/null |
-      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
+      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
 
   langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
   test "$langs" = '*' && langs=x
@@ -818,7 +819,7 @@ if test $with_gettext = yes; then
       a\
           '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
     }
-  ' po/Makevars.template >po/Makevars
+  ' po/Makevars.template >po/Makevars || exit 1
 
   if test -d runtime-po; then
     # Similarly for runtime-po/Makevars, but not quite the same.
@@ -832,7 +833,7 @@ if test $with_gettext = yes; then
         a\
             '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
       }
-    ' <po/Makevars.template >runtime-po/Makevars
+    ' po/Makevars.template >runtime-po/Makevars || exit 1
 
     # Copy identical files from po to runtime-po.
     (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index 93ef4bd..c376756 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -20,6 +20,8 @@
 gnulib_name=libgnu
 gnulib_tool_option_extras=
 
+checkout_only_file=
+
 # gnulib modules used by this package.
 gnulib_modules="
 accept

-----------------------------------------------------------------------

Summary of changes:
 myserver/bootstrap      |   21 +++++++++++----------
 myserver/bootstrap.conf |    2 ++
 2 files changed, 13 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU MyServer