Merge branch 'master' into fix-segfault

probonopd · web-flow · commit 5ee7b8620afd · 2019-03-24T12:41:02.000Z
diff --git a/src/appimagetool.c b/src/appimagetool.c
@@ -1121,7 +1121,7 @@ main (int argc, char *argv[])
 
                 if (pclose(fp) != 0) {
                     fprintf(stderr, "ERROR: %s command did not succeed, could not sign, continuing\n", using_gpg ? "gpg" : "gpg2");
-                    return 1;
+                    return 0;
                 }
 
                 fp = NULL;

Original file line number	Diff line number	Diff line change
`@@ -1121,7 +1121,7 @@ main (int argc, char *argv[])`
`1121`	`1121`
`1122`	`1122`	`if (pclose(fp) != 0) {`
`1123`	`1123`	`fprintf(stderr, "ERROR: %s command did not succeed, could not sign, continuing\n", using_gpg ? "gpg" : "gpg2");`
`1124`		`- return 1;`
	`1124`	`+ return 0;`
`1125`	`1125`	`}`
`1126`	`1126`
`1127`	`1127`	`fp = NULL;`