[GNUnet-SVN] r10782 - in gnunet: . doc/man src/include

[gnunet]

Author: grothoff
Date: 2010-04-05 00:09:19 +0200 (Mon, 05 Apr 2010)
New Revision: 10782

Modified:
   gnunet/configure.ac
   gnunet/doc/man/gnunet-pseudonym.1
   gnunet/src/include/gnunet_datastore_service.h
   gnunet/src/include/gnunet_fs_service.h
Log:
pybld

Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2010-04-04 22:08:43 UTC (rev 10781)
+++ gnunet/configure.ac 2010-04-04 22:09:19 UTC (rev 10782)
@@ -484,6 +484,18 @@
 # restore LIBS
 LIBS=$SAVE_LIBS
 
+# check for python & pexpect (used for some testcases only)
+AC_MSG_CHECKING([for python and pexpect])
+python -c "import pexpect" &> /dev/null
+PYEX=$?
+AM_CONDITIONAL(HAVE_PYTHON_PEXPECT, test $PYEX -eq 0)
+if test $PYEX -eq 0
+then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([not found])
+fi
+
 # libesmtp
 esmtp=0
 AC_MSG_CHECKING([for libesmtp])

Modified: gnunet/doc/man/gnunet-pseudonym.1
===================================================================
--- gnunet/doc/man/gnunet-pseudonym.1   2010-04-04 22:08:43 UTC (rev 10781)
+++ gnunet/doc/man/gnunet-pseudonym.1   2010-04-04 22:09:19 UTC (rev 10782)
@@ -49,14 +49,14 @@
 Publish a namespace advertisement under the keyword 'KEYWORD'.  Default is 
'namespace' (use with \-C).  You can specify \-k multiple times.  In that case, 
the namespace will be published under each of those keywords.
 
 .TP
-\fB\-l\fR, \fB\-\-local\-only\fR
-display names of local namespaces (those that we can extend with content 
because we created them)
-
-.TP
 \fB\-m \fITYPE:VALUE\fR, \fB\-\-meta=\fITYPE:VALUE\fR
 For the main file (or directory), set the metadata of the given TYPE to the 
given VALUE.  Note that this will not add the respective VALUE to the set of 
keywords under which the file can be found.
 
 .TP
+\fB\-o\fR, \fB\-\-only\-local\fR
+display names of local namespaces (those that we can extend with content 
because we created them)
+
+.TP
 \fB\-p \fIPRIORITY\fR, \fB\-\-prio=\fIPRIORITY\fR
 Set the priority of the namespace advertisement (default: 365).  If the local 
database is full, GNUnet will discard the content with the lowest ranking.  
Note that ranks change over time depending on popularity.  The default should 
be high enough to preserve the locally inserted content in favor of content 
that migrates from other peers.
 

Modified: gnunet/src/include/gnunet_datastore_service.h
===================================================================
--- gnunet/src/include/gnunet_datastore_service.h       2010-04-04 22:08:43 UTC 
(rev 10781)
+++ gnunet/src/include/gnunet_datastore_service.h       2010-04-04 22:09:19 UTC 
(rev 10782)
@@ -42,32 +42,34 @@
 #endif
 
 /**
- * FIXME.
+ * Any type of block, used as a wildcard when searching.  Should
+ * never be attached to a specific block.
  */
 #define GNUNET_DATASTORE_BLOCKTYPE_ANY 0
 
 /**
- * FIXME.
+ * Data block (leaf) in the CHK tree.
  */
 #define GNUNET_DATASTORE_BLOCKTYPE_DBLOCK 1
 
 /**
- * FIXME.
+ * Inner block in the CHK tree.
  */
 #define GNUNET_DATASTORE_BLOCKTYPE_IBLOCK 2
 
 /**
- * FIXME.
+ * Type of a block representing a keyword search result.
  */
 #define GNUNET_DATASTORE_BLOCKTYPE_KBLOCK 3
 
 /**
- * FIXME.
+ * Type of a block that is used to advertise content in a namespace.
  */
 #define GNUNET_DATASTORE_BLOCKTYPE_SBLOCK 4
 
 /**
- * FIXME.
+ * Type of a block representing a block to be encoded on demand from disk.
+ * Should never appear on the network directly.
  */
 #define GNUNET_DATASTORE_BLOCKTYPE_ONDEMAND 5
 

Modified: gnunet/src/include/gnunet_fs_service.h
===================================================================
--- gnunet/src/include/gnunet_fs_service.h      2010-04-04 22:08:43 UTC (rev 
10781)
+++ gnunet/src/include/gnunet_fs_service.h      2010-04-04 22:09:19 UTC (rev 
10782)
@@ -1984,7 +1984,7 @@
                       struct GNUNET_FS_Namespace *namespace,
                       const char *identifier,
                       const char *update,
-                      struct GNUNET_CONTAINER_MetaData *meta,
+                      const struct GNUNET_CONTAINER_MetaData *meta,
                       const struct GNUNET_FS_Uri *uri,
                       struct GNUNET_TIME_Absolute expirationTime,
                       uint32_t anonymity,