[systemd-commits] 3 commits - Makefile.am make-man-index.py src/core

[Lennart Poettering]

 Makefile.am             |    4 ++--
 make-man-index.py       |    5 +++++
 src/core/dbus-manager.c |    2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit e616d1c6745f6a6df5a49a3957bd06aa8bd4648b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jul 16 19:11:27 2012 +0200

    core: fix name of dbus call parameter

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 67b7b13..925e87c 100644
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -144,7 +144,7 @@
         "   <arg name=\"set\" type=\"as\" direction=\"in\"/>\n"         \
         "  </method>\n"                                                 \
         "  <method name=\"ListUnitFiles\">\n"                            \
-        "   <arg name=\"changes\" type=\"a(ss)\" direction=\"out\"/>\n" \
+        "   <arg name=\"files\" type=\"a(ss)\" direction=\"out\"/>\n" \
         "  </method>\n"                                                 \
         "  <method name=\"GetUnitFileState\">\n"                        \
         "   <arg name=\"file\" type=\"s\" direction=\"in\"/>\n"         \

commit 051eaebb587d466ed21b51863d52d31fc1df57ca
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jul 16 19:11:10 2012 +0200

    man: include number of man pages in index page

diff --git a/make-man-index.py b/make-man-index.py
index 3644090..44d15f8 100755
--- a/make-man-index.py
+++ b/make-man-index.py
@@ -52,4 +52,9 @@ for n in sorted(index.keys(), key = str.lower):
         i = SubElement(li, 'i')
         i.text = purpose
 
+hr = SubElement(body, 'hr')
+
+p = SubElement(body, 'p')
+p.text = "This index contains %s entries, referring to %i individual manual pages." % (len(index), len(argv)-1)
+
 stdout.write(tostring(html))

commit 6fa9a6109250d964db1f0690150b657db056ef81
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jul 16 19:10:57 2012 +0200

    build-sys: make building of index.html fail sensibly

diff --git a/Makefile.am b/Makefile.am
index a48e05b..cf911a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -668,8 +668,8 @@ noinst_DATA += \
 CLEANFILES += \
 	man/index.html
 
-man/index.html: $(XML_FILES)
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/make-man-index.py $(XML_FILES) > $@
+man/index.html: $(XML_FILES) $(top_srcdir)/make-man-index.py
+	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/make-man-index.py $(XML_FILES) > $@ || rm $@
 endif
 
 endif