[gnunet] branch master updated: -fix debian package issues reported by Florian

[gnunet]

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

grothoff pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 21eb6700d -fix debian package issues reported by Florian
21eb6700d is described below

commit 21eb6700d55be00750dbc2e43ca7bcc752f3ccef
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Aug 8 21:37:43 2021 +0200

    -fix debian package issues reported by Florian
---
 contrib/Makefile.inc     |  3 +--
 doc/handbook/Makefile.am | 40 ++++++++++++++++++++--------------------
 src/arm/arm_api.c        |  7 +++++--
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/contrib/Makefile.inc b/contrib/Makefile.inc
index a563ef4a1..c737a07f8 100644
--- a/contrib/Makefile.inc
+++ b/contrib/Makefile.inc
@@ -8,8 +8,7 @@ BUILDCOMMON_SHLIB_FILES = \
     build-common/sh/lib.sh/existence_python.sh \
     build-common/sh/lib.sh/msg.sh \
     build-common/sh/lib.sh/progname.sh \
-    build-common/sh/lib.sh/version_gnunet.sh \
-    build-common/LICENSE
+    build-common/sh/lib.sh/version_gnunet.sh
 
 BUILDCOMMON_CONF_FILES = \
     build-common/conf/.dir-locals.el \
diff --git a/doc/handbook/Makefile.am b/doc/handbook/Makefile.am
index 5bb374717..acf781b0e 100644
--- a/doc/handbook/Makefile.am
+++ b/doc/handbook/Makefile.am
@@ -38,16 +38,9 @@ dist_infoimage_DATA =                                        
\
        images/gnunet-gtk-0-10-fs-search.png                    \
        images/gnunet-tutorial-service.png                      \
        images/gnunet-tutorial-system.png                       \
-       images/daemon_lego_block.svg                            \
-       images/lego_stack.svg                                   \
-       images/service_lego_block.svg                           \
-       images/structure.dot                                    \
-       images/gns.dot  \
        images/gns.jpg \
-       images/tng.dot  \
        images/tng.png
 
-
 info_TEXINFOS =                                                \
        gnunet.texi
 
@@ -88,24 +81,31 @@ gnunet_TEXINFOS =                                           
\
 EXTRA_DIST =                                                   \
        $(gnunet_TEXINFOS)                                      \
        htmlxref.cnf                                            \
-       version.texi                                           \
+       version.texi                        \
        run-gendocs.sh                                          \
-       docstyle.css                                            \
-        manual.css                                              \
-        reset.css                                               \
-        style.css
+       docstyle.css                        \
+    manual.css                          \
+    reset.css                           \
+    style.css                           \
+    images/daemon_lego_block.svg               \
+       images/lego_stack.svg                       \
+       images/service_lego_block.svg           \
+       images/gns.dot                      \
+       images/structure.dot                \
+       images/tng.dot
+
 
 
 DISTCLEANFILES =                                               \
-       gnunet.cps                                              \
-       chapters/developer.cps                                  \
-       chapters/installation.cps                               \
-       chapter/philosophy.cps                                  \
+       gnunet.cps                                                  \
+       chapters/developer.cps                          \
+       chapters/installation.cps                       \
+       chapter/philosophy.cps                          \
        chapters/user.cps                                       \
-       chapters/configuration.cps                              \
-       chapters/terminology.cps                                \
-       chapters/vocabulary.cps                                 \
-       fdl-1.3.cps                                             \
+       chapters/configuration.cps                      \
+       chapters/terminology.cps                        \
+       chapters/vocabulary.cps                         \
+       fdl-1.3.cps                                                 \
        agpl-3.0.cps                                            \
        gpl-3.0.cps
 
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index afc32fc3a..5fcbfb0a9 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -977,9 +977,12 @@ GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle 
*h,
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
                          "pipe");
-  } else {
+    ret = GNUNET_ARM_RESULT_START_FAILED;
+  }
+  else
+  {
     wsig = GNUNET_DISK_pipe_detach_end (sig,
-                                      GNUNET_DISK_PIPE_END_WRITE);
+                                        GNUNET_DISK_PIPE_END_WRITE);
     ret = start_arm_service (h,
                              std_inheritance,
                              wsig);

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.