diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-08-08 21:37:43 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-08-08 21:37:43 +0200 |
commit | 21eb6700d55be00750dbc2e43ca7bcc752f3ccef (patch) | |
tree | dfb5600f93c49c972f49ef190b9d4ae30e8dc87c | |
parent | 8bc647030af117a7788412ab2828f5b6223dbb14 (diff) | |
download | gnunet-21eb6700d55be00750dbc2e43ca7bcc752f3ccef.tar.gz gnunet-21eb6700d55be00750dbc2e43ca7bcc752f3ccef.zip |
-fix debian package issues reported by Florian
-rw-r--r-- | contrib/Makefile.inc | 3 | ||||
-rw-r--r-- | doc/handbook/Makefile.am | 40 | ||||
-rw-r--r-- | 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 = \ | |||
8 | build-common/sh/lib.sh/existence_python.sh \ | 8 | build-common/sh/lib.sh/existence_python.sh \ |
9 | build-common/sh/lib.sh/msg.sh \ | 9 | build-common/sh/lib.sh/msg.sh \ |
10 | build-common/sh/lib.sh/progname.sh \ | 10 | build-common/sh/lib.sh/progname.sh \ |
11 | build-common/sh/lib.sh/version_gnunet.sh \ | 11 | build-common/sh/lib.sh/version_gnunet.sh |
12 | build-common/LICENSE | ||
13 | 12 | ||
14 | BUILDCOMMON_CONF_FILES = \ | 13 | BUILDCOMMON_CONF_FILES = \ |
15 | build-common/conf/.dir-locals.el \ | 14 | 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 = \ | |||
38 | images/gnunet-gtk-0-10-fs-search.png \ | 38 | images/gnunet-gtk-0-10-fs-search.png \ |
39 | images/gnunet-tutorial-service.png \ | 39 | images/gnunet-tutorial-service.png \ |
40 | images/gnunet-tutorial-system.png \ | 40 | images/gnunet-tutorial-system.png \ |
41 | images/daemon_lego_block.svg \ | ||
42 | images/lego_stack.svg \ | ||
43 | images/service_lego_block.svg \ | ||
44 | images/structure.dot \ | ||
45 | images/gns.dot \ | ||
46 | images/gns.jpg \ | 41 | images/gns.jpg \ |
47 | images/tng.dot \ | ||
48 | images/tng.png | 42 | images/tng.png |
49 | 43 | ||
50 | |||
51 | info_TEXINFOS = \ | 44 | info_TEXINFOS = \ |
52 | gnunet.texi | 45 | gnunet.texi |
53 | 46 | ||
@@ -88,24 +81,31 @@ gnunet_TEXINFOS = \ | |||
88 | EXTRA_DIST = \ | 81 | EXTRA_DIST = \ |
89 | $(gnunet_TEXINFOS) \ | 82 | $(gnunet_TEXINFOS) \ |
90 | htmlxref.cnf \ | 83 | htmlxref.cnf \ |
91 | version.texi \ | 84 | version.texi \ |
92 | run-gendocs.sh \ | 85 | run-gendocs.sh \ |
93 | docstyle.css \ | 86 | docstyle.css \ |
94 | manual.css \ | 87 | manual.css \ |
95 | reset.css \ | 88 | reset.css \ |
96 | style.css | 89 | style.css \ |
90 | images/daemon_lego_block.svg \ | ||
91 | images/lego_stack.svg \ | ||
92 | images/service_lego_block.svg \ | ||
93 | images/gns.dot \ | ||
94 | images/structure.dot \ | ||
95 | images/tng.dot | ||
96 | |||
97 | 97 | ||
98 | 98 | ||
99 | DISTCLEANFILES = \ | 99 | DISTCLEANFILES = \ |
100 | gnunet.cps \ | 100 | gnunet.cps \ |
101 | chapters/developer.cps \ | 101 | chapters/developer.cps \ |
102 | chapters/installation.cps \ | 102 | chapters/installation.cps \ |
103 | chapter/philosophy.cps \ | 103 | chapter/philosophy.cps \ |
104 | chapters/user.cps \ | 104 | chapters/user.cps \ |
105 | chapters/configuration.cps \ | 105 | chapters/configuration.cps \ |
106 | chapters/terminology.cps \ | 106 | chapters/terminology.cps \ |
107 | chapters/vocabulary.cps \ | 107 | chapters/vocabulary.cps \ |
108 | fdl-1.3.cps \ | 108 | fdl-1.3.cps \ |
109 | agpl-3.0.cps \ | 109 | agpl-3.0.cps \ |
110 | gpl-3.0.cps | 110 | gpl-3.0.cps |
111 | 111 | ||
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, | |||
977 | { | 977 | { |
978 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, | 978 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, |
979 | "pipe"); | 979 | "pipe"); |
980 | } else { | 980 | ret = GNUNET_ARM_RESULT_START_FAILED; |
981 | } | ||
982 | else | ||
983 | { | ||
981 | wsig = GNUNET_DISK_pipe_detach_end (sig, | 984 | wsig = GNUNET_DISK_pipe_detach_end (sig, |
982 | GNUNET_DISK_PIPE_END_WRITE); | 985 | GNUNET_DISK_PIPE_END_WRITE); |
983 | ret = start_arm_service (h, | 986 | ret = start_arm_service (h, |
984 | std_inheritance, | 987 | std_inheritance, |
985 | wsig); | 988 | wsig); |