[GNUnet-SVN] r35848 - in gnunet/src: fs hostlist include

[gnunet]

Author: grothoff
Date: 2015-05-31 21:43:33 +0200 (Sun, 31 May 2015)
New Revision: 35848

Modified:
   gnunet/src/fs/fs_publish.c
   gnunet/src/hostlist/hostlist.conf
   gnunet/src/include/gnunet_datastore_service.h
Log:
-fix #3799



Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2015-05-31 19:37:07 UTC (rev 35847)
+++ gnunet/src/fs/fs_publish.c  2015-05-31 19:43:33 UTC (rev 35848)
@@ -143,6 +143,8 @@
     }
     return;
   }
+  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+              "SOME DONE!\n");
   pc->any_done = GNUNET_YES;
   GNUNET_assert (NULL == pc->upload_task);
   pc->upload_task =
@@ -196,11 +198,15 @@
   pi.value.publish.eta = GNUNET_TIME_UNIT_FOREVER_REL;
   pi.value.publish.specifics.error.message = emsg;
   p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p, 0);
-  if ((p->is_directory != GNUNET_YES) && (p->filename != NULL) &&
+  if ((p->is_directory != GNUNET_YES) &&
+      (NULL != p->filename) &&
+      (GNUNET_YES == pc->any_done) &&
       (p->data.file.do_index == GNUNET_YES))
   {
     /* run unindex to clean up */
-    GNUNET_FS_unindex_start (pc->h, p->filename, NULL);
+    GNUNET_FS_unindex_start (pc->h,
+                             p->filename,
+                             NULL);
   }
 
 }
@@ -1278,7 +1284,8 @@
  * @param msg error message on error, otherwise NULL
  */
 static void
-finish_reserve (void *cls, int success,
+finish_reserve (void *cls,
+                int success,
                struct GNUNET_TIME_Absolute min_expiration,
                const char *msg)
 {
@@ -1285,11 +1292,13 @@
   struct GNUNET_FS_PublishContext *pc = cls;
 
   pc->qre = NULL;
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reservation complete (%d)!\n", 
success);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Reservation complete (%d)!\n",
+              success);
   if ((msg != NULL) || (success <= 0))
   {
     GNUNET_asprintf (&pc->fi->emsg,
-                    _("Insufficient space for publishing: %s"),
+                    _("Datastore failure: %s"),
                      msg);
     signal_publish_error (pc->fi, pc, pc->fi->emsg);
     return;

Modified: gnunet/src/hostlist/hostlist.conf
===================================================================
--- gnunet/src/hostlist/hostlist.conf   2015-05-31 19:37:07 UTC (rev 35847)
+++ gnunet/src/hostlist/hostlist.conf   2015-05-31 19:43:33 UTC (rev 35848)
@@ -19,7 +19,7 @@
 OPTIONS = -b
 
 # Default list of hostlist servers for bootstrapping
-SERVERS = http://v10.gnunet.org/hostlist https://gnunet.io/hostlist
+SERVERS = http://v10.gnunet.org/hostlist/ https://gnunet.io/hostlist
 # http://silent.0xdeadc0de.eu:8080/
 
 # bind hostlist http server to a specific IPv4

Modified: gnunet/src/include/gnunet_datastore_service.h
===================================================================
--- gnunet/src/include/gnunet_datastore_service.h       2015-05-31 19:37:07 UTC 
(rev 35847)
+++ gnunet/src/include/gnunet_datastore_service.h       2015-05-31 19:43:33 UTC 
(rev 35848)
@@ -72,10 +72,11 @@
  * associated resources).
  *
  * @param h handle to the datastore
- * @param drop set to GNUNET_YES to delete all data in datastore (!)
+ * @param drop set to #GNUNET_YES to delete all data in datastore (!)
  */
 void
-GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h, int drop);
+GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h,
+                             int drop);
 
 
 /**