X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=5988faf77a5cd13f1b4e1930299b8c90073efc3d;hp=5bfba37d9197b7910046fa9efd6685167166164b;hb=25518356767bd60bd03ac2f9c6b2381644483925;hpb=d56a8447f418cf9046077e743772a416b6f7b826

diff --git a/write_common.c b/write_common.c
index 5bfba37d..5988faf7 100644
--- a/write_common.c
+++ b/write_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -92,7 +92,6 @@ void register_writer_node(struct writer_node *wn, struct btr_node *parent)
 		.handler = w->execute, .context = wn));
 	strcpy(wn->task.status, name);
 	free(name);
-	w->open(wn);
 	wn->task.post_select = w->post_select;
 	wn->task.pre_select = w->pre_select;
 	register_task(&wn->task);
@@ -158,7 +157,15 @@ static void get_btr_value(struct btr_node *btrn, const char *cmd,
 	char *buf = NULL;
 	int ret = btr_exec_up(btrn, cmd, &buf);
 
-	assert(ret >= 0);
+	if (ret < 0) {
+		/*
+		 * This really should not happen. It means one of our parent
+		 * nodes died unexpectedly. Proceed with fingers crossed.
+		 */
+		PARA_CRIT_LOG("cmd %s: %s\n", cmd, para_strerror(-ret));
+		*result = 0;
+		return;
+	}
 	ret = para_atoi32(buf, result);
 	assert(ret >= 0);
 	free(buf);