Browse code

Remove hard kill code for fail

Nat! authored on 20-04-2017 15:13:56
Showing 4 changed files
... ...
@@ -1,3 +1,9 @@
1
+
2
+### 3.4.1
3
+
4
+* experimentally, don't kill so hard anymore when failing (mostly for
5
+mulle-builds sake)
6
+
1 7
 ### 3.4.0
2 8
 
3 9
 * added handling of `additional_repositories`. This is supposed to be used
... ...
@@ -30,7 +30,7 @@
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 MULLE_EXECUTABLE_VERSION_MAJOR=3
32 32
 MULLE_EXECUTABLE_VERSION_MINOR=4
33
-MULLE_EXECUTABLE_VERSION_PATCH=0
33
+MULLE_EXECUTABLE_VERSION_PATCH=1
34 34
 
35 35
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
36 36
 
... ...
@@ -30,7 +30,7 @@
30 30
 #   POSSIBILITY OF SUCH DAMAGE.
31 31
 MULLE_EXECUTABLE_VERSION_MAJOR=3
32 32
 MULLE_EXECUTABLE_VERSION_MINOR=4
33
-MULLE_EXECUTABLE_VERSION_PATCH=0
33
+MULLE_EXECUTABLE_VERSION_PATCH=1
34 34
 
35 35
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
36 36
 
... ...
@@ -157,14 +157,14 @@ _bail()
157 157
    # should kill process group...
158 158
    kill 0
159 159
 
160
-   if [ ! -z "${MULLE_EXECUTABLE_PID}" ]
161
-   then
162
-      kill -INT "${MULLE_EXECUTABLE_PID}"  # kill myself (especially, if executing in subshell)
163
-      if [ $$ -ne ${MULLE_EXECUTABLE_PID} ]
164
-      then
165
-         kill -INT $$  # actually useful
166
-      fi
167
-   fi
160
+#   if [ ! -z "${MULLE_EXECUTABLE_PID}" ]
161
+#   then
162
+#      kill -INT "${MULLE_EXECUTABLE_PID}"  # kill myself (especially, if executing in subshell)
163
+#      if [ $$ -ne ${MULLE_EXECUTABLE_PID} ]
164
+#      then
165
+#         kill -INT $$  # actually useful
166
+#      fi
167
+#   fi
168 168
 
169 169
    exit 1        # paranoia
170 170
    # don't ask me why the fail message is printed twice