From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 6 Mar 2013 14:55:27 +0000 (+0000)
Subject: -fixes
X-Git-Tag: initial-import-from-subversion-38251~9729
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=48f89e668ca47d4538df015d1d6d309c4a0595ea;p=oweals%2Fgnunet.git

-fixes
---

diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index f3340ee5e..9d8691b76 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -949,6 +949,7 @@ GNUNET_FS_uri_sks_create (struct GNUNET_FS_Namespace *ns, const char *id,
     *emsg = GNUNET_strdup (_("identifier has zero length!"));
     return NULL;
   }
+  *emsg = NULL;
   ns_uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
   ns_uri->type = GNUNET_FS_URI_SKS;
   GNUNET_FS_namespace_get_public_identifier (ns, &ns_uri->data.sks.ns);
diff --git a/src/fs/test_gnunet_fs_ns.py.in b/src/fs/test_gnunet_fs_ns.py.in
index ff892b40f..6c16e55a1 100755
--- a/src/fs/test_gnunet_fs_ns.py.in
+++ b/src/fs/test_gnunet_fs_ns.py.in
@@ -67,10 +67,6 @@ try:
   s.expect ("stdout", re.compile (r'gnunet-download gnunet://fs/sks/.*/myroot\r?\n'))
   s.expect ("stdout", re.compile (r'\s*description: Free Software Licenses\r?\n'))
 
-  pseu = pexpect ()
-  pseu.spawn (None, [pseudonym, '-c', 'test_gnunet_fs_ns_data.conf'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-  pseu.expect ("stdout", re.compile (r'Free Software Licenses.*:\r?\n'))
-
 finally:
   arm = subprocess.Popen ([gnunetarm, '-eq', '-c', 'test_gnunet_fs_ns_data.conf'])
   arm.communicate ()