From: Christian Grothoff <christian@grothoff.org>
Date: Mon, 10 Jan 2011 14:03:28 +0000 (+0000)
Subject: fix
X-Git-Tag: initial-import-from-subversion-38251~19354
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=22913a818047f1188a7ee4dadb406b9dc41efe84;p=oweals%2Fgnunet.git

fix
---

diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c
index 6de8206f1..ba280db7a 100644
--- 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 e48bc8512..505d88aa3 100644
--- 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 a36d89736..25c108e70 100755
--- 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)