[gnunet] branch master updated (ae07ba8f0 -> d826278ee)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository gnunet.

    from ae07ba8f0 bootstrap: no need for sleep.
     new ed7e4ab51 update submodule
     new d826278ee bootstrap: add git submodule sync. force symlinks.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 bootstrap            | 23 ++++++++++++++++++++---
 contrib/build-common |  2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/bootstrap b/bootstrap
index 1160ab13c..e846307d8 100755
--- a/bootstrap
+++ b/bootstrap
@@ -23,8 +23,8 @@ check_uncrustify()
 {
     if existence uncrustify; then
         echo "Installing uncrustify hook and configuration"
-        ln -s contrib/uncrustify.cfg uncrustify.cfg 2> /dev/null
-        ln -s ../../contrib/uncrustify_precommit .git/hooks/pre-commit 2> 
/dev/null
+        ln -fs contrib/build-common/conf/uncrustify.cfg uncrustify.cfg 2> 
/dev/null
+        ln -fs contrib/build-common/conf/uncrustify_precommit 
.git/hooks/pre-commit 2> /dev/null
     else
         echo "Uncrustify not detected, hook not installed."
         echo "Please install uncrustify if you plan on doing development"
@@ -48,7 +48,7 @@ check_yapf()
        existence yapf3.9 || \
        existence yapf4.0; then
         echo "Installing yapf symlink"
-        ln -s contrib/conf/.style.yapf 2> /dev/null
+        ln -fs contrib/build-common/conf/.style.yapf .style.yapf 2> /dev/null
     else
         echo "yapf not detected, please install yapf if you plan on 
contributing python code"
     fi
@@ -70,9 +70,26 @@ check_libtool()
     fi
 }
 
+submodules()
+{
+    # Try to update the submodule. Since bootstrap
+    # is also invoked by distributors, we must
+    # ignore any failing of this function as we
+    # could have no outgoing network connection
+    # in a restricted environment.
+    if ! git --version >/dev/null; then
+        echo "git not installed, skipping submodule update"
+    else
+        git submodule update --init || true
+        git submodule update --recursive --remote || true
+        git submodule sync || true
+    fi
+}
+
 main()
 {
     cleanup
+    submodules
     check_uncrustify
     check_yapf
     check_libtool
diff --git a/contrib/build-common b/contrib/build-common
index 253680192..6ac60bd0b 160000
--- a/contrib/build-common
+++ b/contrib/build-common
@@ -1 +1 @@
-Subproject commit 2536801927781ea38fefc3de924934e1c6a74d88
+Subproject commit 6ac60bd0b1f96324b4175fa03aaf9780ed8efb47

-- 
To stop receiving notification emails like this one, please contact
address@hidden.