[SCM] master: Catch bad refpurpose tags. And fix funit-procmask.xml and funit-exit.xml.

[mark at sourceware dot org]

The branch, master has been updated
       via  c7c9068679a57d65feaa31102116f95bd5d56fbe (commit)
      from  fcdc9da1e58960f0fe8c3308f21c765abedbc4bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit c7c9068679a57d65feaa31102116f95bd5d56fbe
Author: Mark Wielaard <mwielaard@redhat.com>
Date:   Thu Apr 3 19:35:22 2008 +0200

    Catch bad refpurpose tags. And fix funit-procmask.xml and funit-exit.xml.
    
    frysk-common/ChangeLog
    2008-04-03  Mark Wielaard  <mwielaard@redhat.com>
    
           * manpages.sh: Catch bad refpurpose tags.
    
    frysk-core/frysk/pkglibdir/ChangeLog
    2008-04-03  Mark Wielaard  <mwielaard@redhat.com>
    
           * funit-procmask.xml: Put refpurpose on one line by itself.
           * funit-exit.xml: Likewise.
    
    frysk-top/ChangeLog
    2008-04-03  Mark Wielaard  <mwielaard@redhat.com>
    
           * Makefile.am (manpages): Check for refpurpose errors.

-----------------------------------------------------------------------

Summary of changes:
 frysk-common/ChangeLog                       |    4 ++++
 frysk-common/manpages.sh                     |    5 ++++-
 frysk-core/frysk/pkglibdir/ChangeLog         |    5 +++++
 frysk-core/frysk/pkglibdir/funit-exit.xml    |    4 ++--
 frysk-sys/frysk/pkglibdir/funit-procmask.xml |    3 +--
 frysk-top/ChangeLog                          |    4 ++++
 frysk-top/Makefile.am                        |    3 ++-
 7 files changed, 22 insertions(+), 6 deletions(-)

First 500 lines of diff:
diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog
index 4444b75..a96c691 100644
--- a/frysk-common/ChangeLog
+++ b/frysk-common/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-03  Mark Wielaard  <mwielaard@redhat.com>
+
+	* manpages.sh: Catch bad refpurpose tags.
+
 2008-04-03  Andrew Cagney  <cagney@redhat.com>
 
 	* version.in: Bump to 0.2.50.
diff --git a/frysk-common/manpages.sh b/frysk-common/manpages.sh
index 63c1168..ac0c0b6 100755
--- a/frysk-common/manpages.sh
+++ b/frysk-common/manpages.sh
@@ -83,7 +83,10 @@ EOF
 	cat <<EOF
 <li><tt><a href="${name}.${n}.html">${name}.${n}</a></tt>
 EOF
-	sed -n 's/<refpurpose>\(.*\)<\/refpurpose>/\1/ p' $xmlfile
+	# Catch empty (aka not on one line) refpurpose tags.
+	desc=$(sed -n 's/<refpurpose>\(.*\)<\/refpurpose>/\1/ p' $xmlfile)
+	if test -z "$desc"; then exit 1; fi
+	echo "$desc"
 	echo "</li>"
     fi
 done
diff --git a/frysk-core/frysk/pkglibdir/ChangeLog b/frysk-core/frysk/pkglibdir/ChangeLog
index 97d9c2c..e91c206 100644
--- a/frysk-core/frysk/pkglibdir/ChangeLog
+++ b/frysk-core/frysk/pkglibdir/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-03  Mark Wielaard  <mwielaard@redhat.com>
+
+	* funit-procmask.xml: Put refpurpose on one line by itself.
+	* funit-exit.xml: Likewise.
+
 2008-04-01  Phil Muldoon  <pmuldoon@redhat.com>
 
 	* funit-watchpoint.S: New.
diff --git a/frysk-core/frysk/pkglibdir/funit-exit.xml b/frysk-core/frysk/pkglibdir/funit-exit.xml
index c442d85..d420b15 100644
--- a/frysk-core/frysk/pkglibdir/funit-exit.xml
+++ b/frysk-core/frysk/pkglibdir/funit-exit.xml
@@ -61,8 +61,8 @@
   </refmeta>
 
   <refnamediv>
-    <refname>funit-exit</refname> <refpurpose>exits with specified
-    status, or terminates with the specified signal</refpurpose>
+    <refname>funit-exit</refname>
+    <refpurpose>exits with specified status, or terminates with the specified signal</refpurpose>
   </refnamediv>
   
   <refsynopsisdiv>
diff --git a/frysk-sys/frysk/pkglibdir/funit-procmask.xml b/frysk-sys/frysk/pkglibdir/funit-procmask.xml
index 933b147..add4d7b 100644
--- a/frysk-sys/frysk/pkglibdir/funit-procmask.xml
+++ b/frysk-sys/frysk/pkglibdir/funit-procmask.xml
@@ -62,8 +62,7 @@
 
   <refnamediv>
     <refname>funit-procmask</refname>
-    <refpurpose>Test the processes signal mask for the presence (or
-    absence) of a list if signals</refpurpose>
+    <refpurpose>Test the processes signal mask for the presence (or absence) of a list if signals</refpurpose>
   </refnamediv>
   
   <refsynopsisdiv>
diff --git a/frysk-top/ChangeLog b/frysk-top/ChangeLog
index e8a0ad7..03cbbec 100644
--- a/frysk-top/ChangeLog
+++ b/frysk-top/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-03  Mark Wielaard  <mwielaard@redhat.com>
+
+	* Makefile.am (manpages): Check for refpurpose errors.
+
 2008-04-02  Andrew Cagney  <cagney@redhat.com>
 
 	* Makefile.am (manpages): Make un-conditional.
diff --git a/frysk-top/Makefile.am b/frysk-top/Makefile.am
index 6c45b4b..9f6a8c8 100644
--- a/frysk-top/Makefile.am
+++ b/frysk-top/Makefile.am
@@ -88,7 +88,8 @@ manpages manpages/index.html:
 		-"GNOME Interface" \
 		$(srcdir)/frysk-gui/frysk/bindir/*.xml \
 		-"Test framework" \
-		$(srcdir)/*/frysk/pkglibdir/*.xml
+		$(srcdir)/*/frysk/pkglibdir/*.xml \
+	    || (echo "Bad [not on one line] refpurpose tag found."; exit 1)
 	mv manpages/index.new manpages/index.html
 
 # Generate JAVADOC documentation.


hooks/post-receive
--
frysk system monitor/debugger