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

[gnunet]

Author: grothoff
Date: 2011-01-10 15:03:28 +0100 (Mon, 10 Jan 2011)
New Revision: 14134

Modified:
   gnunet/src/fs/gnunet-directory.c
   gnunet/src/fs/gnunet-search.c
   gnunet/src/fs/test_gnunet_fs_rec.py.in
Log:
fix

Modified: gnunet/src/fs/gnunet-directory.c
===================================================================
--- gnunet/src/fs/gnunet-directory.c    2011-01-10 13:31:03 UTC (rev 14133)
+++ gnunet/src/fs/gnunet-directory.c    2011-01-10 14:03:28 UTC (rev 14134)
@@ -51,6 +51,8 @@
   if ( (format != EXTRACTOR_METAFORMAT_UTF8) &&
        (format != EXTRACTOR_METAFORMAT_C_STRING) )
     return 0;
+  if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME) 
+    return 0;
   printf ("\t%20s: %s\n",
           dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN,
                     EXTRACTOR_metatype_to_string (type)), data);

Modified: gnunet/src/fs/gnunet-search.c
===================================================================
--- gnunet/src/fs/gnunet-search.c       2011-01-10 13:31:03 UTC (rev 14133)
+++ gnunet/src/fs/gnunet-search.c       2011-01-10 14:03:28 UTC (rev 14134)
@@ -75,6 +75,8 @@
   if ( (format != EXTRACTOR_METAFORMAT_UTF8) &&
        (format != EXTRACTOR_METAFORMAT_C_STRING) )
     return 0;
+  if (type == EXTRACTOR_METATYPE_GNUNET_ORIGINAL_FILENAME) 
+    return 0;
   printf ("\t%20s: %s\n",
           dgettext (LIBEXTRACTOR_GETTEXT_DOMAIN,
                     EXTRACTOR_metatype_to_string (type)),

Modified: gnunet/src/fs/test_gnunet_fs_rec.py.in
===================================================================
--- gnunet/src/fs/test_gnunet_fs_rec.py.in      2011-01-10 13:31:03 UTC (rev 
14133)
+++ gnunet/src/fs/test_gnunet_fs_rec.py.in      2011-01-10 14:03:28 UTC (rev 
14134)
@@ -40,8 +40,8 @@
   down.expect (pexpect.EOF);
 
   dir = pexpect.spawn ('gnunet-directory -c test_gnunet_fs_rec_data.conf  
rdir/a.gnd')
-  dir.expect (re.compile (" last: a"));
-  dir.expect (re.compile (" last: COPYING"));
+#  dir.expect (re.compile (" last: a"));
+#  dir.expect (re.compile (" last: COPYING"));
 #  dir.expect (re.compile (" *embedded filename: a"));
 #  dir.expect (re.compile (" *embedded filename: COPYING"));
   dir.expect (pexpect.EOF)