diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-09-27 07:36:20 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-09-27 07:36:20 +0000 |
commit | 1b592499ba6f6d2b15306407760c989553a3c5b6 (patch) | |
tree | 86b7778377081cc663d28fc7e1b044ee70d25c38 /src/fs | |
parent | d60c2402b66776d6a287c99c676bd038f950e020 (diff) | |
download | gnunet-1b592499ba6f6d2b15306407760c989553a3c5b6.tar.gz gnunet-1b592499ba6f6d2b15306407760c989553a3c5b6.zip |
-trying to fix unindex trouble on keyword extraction
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/fs_unindex.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c index 71a1b9e0b..221760328 100644 --- a/src/fs/fs_unindex.c +++ b/src/fs/fs_unindex.c | |||
@@ -341,12 +341,13 @@ unindex_directory_scan_cb (void *cls, | |||
341 | { | 341 | { |
342 | uc->ksk_uri = GNUNET_FS_uri_dup (directory_scan_result->ksk_uri); | 342 | uc->ksk_uri = GNUNET_FS_uri_dup (directory_scan_result->ksk_uri); |
343 | uc->state = UNINDEX_STATE_DS_REMOVE_KBLOCKS; | 343 | uc->state = UNINDEX_STATE_DS_REMOVE_KBLOCKS; |
344 | uc->emsg = GNUNET_strdup (_("Failed to get KSKs from directory scan.")); | ||
345 | GNUNET_FS_unindex_sync_ (uc); | 344 | GNUNET_FS_unindex_sync_ (uc); |
346 | GNUNET_FS_unindex_do_remove_kblocks_ (uc); | 345 | GNUNET_FS_unindex_do_remove_kblocks_ (uc); |
347 | } | 346 | } |
348 | else | 347 | else |
349 | { | 348 | { |
349 | uc->emsg = GNUNET_strdup (_("Failed to get KSKs from directory scan.")); | ||
350 | GNUNET_FS_unindex_sync_ (uc); | ||
350 | unindex_finish (uc); | 351 | unindex_finish (uc); |
351 | } | 352 | } |
352 | GNUNET_FS_share_tree_free (directory_scan_result); | 353 | GNUNET_FS_share_tree_free (directory_scan_result); |
@@ -355,11 +356,15 @@ unindex_directory_scan_cb (void *cls, | |||
355 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 356 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
356 | _("Internal error scanning `%s'.\n"), | 357 | _("Internal error scanning `%s'.\n"), |
357 | uc->filename); | 358 | uc->filename); |
359 | GNUNET_FS_directory_scan_abort (uc->dscan); | ||
360 | uc->dscan = NULL; | ||
361 | uc->emsg = GNUNET_strdup (_("Failed to get KSKs from directory scan.")); | ||
362 | GNUNET_FS_unindex_sync_ (uc); | ||
363 | unindex_finish (uc); | ||
358 | break; | 364 | break; |
359 | default: | 365 | default: |
360 | break; | 366 | break; |
361 | } | 367 | } |
362 | |||
363 | } | 368 | } |
364 | 369 | ||
365 | 370 | ||