[systemd-commits] 2 commits - make-man-index.py man/sd_journal_get_catalog.xml TODO

[Zbigniew Jędrzejewski-Szmek]

 TODO                           |   12 ++++++++++++
 make-man-index.py              |    7 +++++++
 man/sd_journal_get_catalog.xml |    2 +-
 3 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 3c1872ebb6e9a435f61c3df0399a353ae28fb472
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Mar 7 13:04:17 2013 -0500

    build-sys: check if manpage ids match file names
    
    Commit ed1553a fixed current errors, but this error is easy to
    make. A wrong id messes up the indexes and linking, so it is
    better to catch this automatically.

diff --git a/make-man-index.py b/make-man-index.py
index f829d98..d38d5b6 100755
--- a/make-man-index.py
+++ b/make-man-index.py
@@ -21,6 +21,7 @@
 import collections
 import xml.etree.ElementTree as tree
 import sys
+import re
 MDASH = ' — ' if sys.version_info.major >= 3 else ' -- '
 
 TEMPLATE = '''\
@@ -66,10 +67,16 @@ SUMMARY = '''\
 COUNTS = '\
 This index contains {count} entries, referring to {pages} individual manual pages.'
 
+def check_id(page, t):
+    id = t.getroot().get('id')
+    if not re.search('/' + id + '[.]', page):
+        raise ValueError("id='{}' is not the same as page name '{}'".format(id, page))
+
 def make_index(pages):
     index = collections.defaultdict(list)
     for p in pages:
         t = tree.parse(p)
+        check_id(p, t)
         section = t.find('./refmeta/manvolnum').text
         refname = t.find('./refnamediv/refname').text
         purpose = ' '.join(t.find('./refnamediv/refpurpose').text.split())

commit 7ba9719595ee13612c9aea786233ffdd4d77ee46
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Thu Mar 7 12:41:22 2013 -0500

    TODO: python stuff and freeze and standby

diff --git a/TODO b/TODO
index 42c5361..f4c0dd5 100644
--- a/TODO
+++ b/TODO
@@ -220,6 +220,9 @@ Features:
   - systemctl: "Journal has been rotated since unit was started." message is misleading
   - support "systemctl stop foobar at .service" to stop all units matching a certain template
   - Something is wrong with symlink handling of "autovt at .service" in "systemctl list-unit-files"
+  - add configuration/switches to use
+    freeze (http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git) and
+    standby (https://bugs.freedesktop.org/show_bug.cgi?id=57793) as suspend modes
 
 * When shutdown.target is queued begin with an asynchronous sync()?
 
@@ -559,6 +562,15 @@ Features:
 
 * drop cap bounding set in readahead and other services
 
+* systemd-python:
+   - export sd_journal_get_catalog (in systemd.journal._reader)
+   - export sd_journal_get_catalog_for_message_id (in systemd.id128)
+   - allow reading of only select fields in systemd.journal._reader.Reader
+   - export sd_journal_test_cursor in systemd.journal._reader.Reader
+   - export sd_journal_get_usage in systemd.journal._reader.Reader
+   - figure out a simple way to wait for journal events in a way that
+     works with ^C
+
 External:
 
 * dbus:
diff --git a/man/sd_journal_get_catalog.xml b/man/sd_journal_get_catalog.xml
index fa9bbc9..b3c7b58 100644
--- a/man/sd_journal_get_catalog.xml
+++ b/man/sd_journal_get_catalog.xml
@@ -103,7 +103,7 @@
                 <para><function>sd_journal_get_catalog()</function>
                 and
                 <function>sd_journal_get_catalog_for_message_id()</function>
-                returns 0 on success or a negative errno-style error
+                return 0 on success or a negative errno-style error
                 code. If no matching message catalog entry is found
                 -ENOENT is returned.</para>
         </refsect1>