fix

diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c
index 6de8206f1caf491a12e9c3db83ef884a6a454233..ba280db7ae7c2321744286d8856e6e8a3351253e 100644 (file)
--- a/src/fs/gnunet-directory.c
+++ b/src/fs/gnunet-directory.c
@@ -51,6 +51,8 @@ item_printer (void *cls,
   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);

diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index e48bc85124149aaf3165bf63e3c800e469ebd9dc..505d88aa3136bc2d24c3bc1424589142ecc6a5a4 100644 (file)
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -75,6 +75,8 @@ item_printer (void *cls,
   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)),

diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in
index a36d8973618962939c45c257f26febefefea58ce..25c108e708afd34d908ab9addc8849b97ddbe34e 100755 (executable)
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ b/src/fs/test_gnunet_fs_rec.py.in
@@ -40,8 +40,8 @@ try:
   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)