aboutsummaryrefslogtreecommitdiff
path: root/src/fs
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-03-06 14:55:27 +0000
committerChristian Grothoff <christian@grothoff.org>2013-03-06 14:55:27 +0000
commit48f89e668ca47d4538df015d1d6d309c4a0595ea (patch)
treeaf8e7936031679008b4d5c24ec94d9dcd496040b /src/fs
parentb81a3fc0374acebbbba206ab255fe33ed811e2a5 (diff)
downloadgnunet-48f89e668ca47d4538df015d1d6d309c4a0595ea.tar.gz
gnunet-48f89e668ca47d4538df015d1d6d309c4a0595ea.zip
-fixes
Diffstat (limited to 'src/fs')
-rw-r--r--src/fs/fs_uri.c1
-rwxr-xr-xsrc/fs/test_gnunet_fs_ns.py.in4
2 files changed, 1 insertions, 4 deletions
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,
949 *emsg = GNUNET_strdup (_("identifier has zero length!")); 949 *emsg = GNUNET_strdup (_("identifier has zero length!"));
950 return NULL; 950 return NULL;
951 } 951 }
952 *emsg = NULL;
952 ns_uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri)); 953 ns_uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
953 ns_uri->type = GNUNET_FS_URI_SKS; 954 ns_uri->type = GNUNET_FS_URI_SKS;
954 GNUNET_FS_namespace_get_public_identifier (ns, &ns_uri->data.sks.ns); 955 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:
67 s.expect ("stdout", re.compile (r'gnunet-download gnunet://fs/sks/.*/myroot\r?\n')) 67 s.expect ("stdout", re.compile (r'gnunet-download gnunet://fs/sks/.*/myroot\r?\n'))
68 s.expect ("stdout", re.compile (r'\s*description: Free Software Licenses\r?\n')) 68 s.expect ("stdout", re.compile (r'\s*description: Free Software Licenses\r?\n'))
69 69
70 pseu = pexpect ()
71 pseu.spawn (None, [pseudonym, '-c', 'test_gnunet_fs_ns_data.conf'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
72 pseu.expect ("stdout", re.compile (r'Free Software Licenses.*:\r?\n'))
73
74finally: 70finally:
75 arm = subprocess.Popen ([gnunetarm, '-eq', '-c', 'test_gnunet_fs_ns_data.conf']) 71 arm = subprocess.Popen ([gnunetarm, '-eq', '-c', 'test_gnunet_fs_ns_data.conf'])
76 arm.communicate () 72 arm.communicate ()