[GNUnet-SVN] r25566 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2012-12-19 20:34:19 +0100 (Wed, 19 Dec 2012)
New Revision: 25566

Modified:
   gnunet/src/fs/gnunet-publish.c
Log:
-preserve command-line keywords even if extractor is disabled

Modified: gnunet/src/fs/gnunet-publish.c
===================================================================
--- gnunet/src/fs/gnunet-publish.c      2012-12-19 19:32:23 UTC (rev 25565)
+++ gnunet/src/fs/gnunet-publish.c      2012-12-19 19:34:19 UTC (rev 25566)
@@ -273,6 +273,12 @@
 
   if (cls == fi)
     return GNUNET_OK;
+  if ( (disable_extractor) &&
+       (NULL != *uri) )
+  {
+    GNUNET_FS_uri_destroy (*uri);
+    *uri = NULL;
+  }
   if (NULL != topKeywords)
   {
     if (*uri != NULL)
@@ -296,12 +302,6 @@
   }
   if (!do_disable_creation_time)
     GNUNET_CONTAINER_meta_data_add_publication_date (m);
-  if ( (disable_extractor) &&
-       (NULL != *uri) )
-  {
-    GNUNET_FS_uri_destroy (*uri);
-    *uri = NULL;
-  }
   if (extract_only)
   {
     fn = GNUNET_CONTAINER_meta_data_get_by_type (m,