[debian-edu-commits] debian-edu/ 02/04: Teach documentation/scripts/get_manual to ignore unactionable FIXMEs.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-doc.

commit b4673e5113c0228b1aa69981990ea5b340bbf144
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri May 27 15:25:31 2016 +0200

    Teach documentation/scripts/get_manual to ignore unactionable FIXMEs.
---
 debian/changelog                               |  1 +
 documentation/debian-edu-itil/fixme-status.txt | 29 --------------------------
 documentation/scripts/get_manual               |  8 +++----
 3 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 29b7852..0778224 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ debian-edu-doc (1.901~20160522~9+edu1) UNRELEASED; urgency=medium
   * Update Debian Edu Jessie and Wheezy manuals from the wiki.
   * Update debian/copyright from the wikis using the update-copyright
     target.
+  * Teach documentation/scripts/get_manual to ignore unactionable FIXMEs.
 
   [ Wolfgang Schweer ]
   * Update Debian Edu Stretch manual from the wiki.
diff --git a/documentation/debian-edu-itil/fixme-status.txt b/documentation/debian-edu-itil/fixme-status.txt
index 0c8310f..d5ac011 100644
--- a/documentation/debian-edu-itil/fixme-status.txt
+++ b/documentation/debian-edu-itil/fixme-status.txt
@@ -1,36 +1,7 @@
 ----------------------------------
-https://wiki.debian.org/DebianEdu/Documentation/ITIL//Support
-FIXME> 
-----------------------------------
 https://wiki.debian.org/DebianEdu/Documentation/ITIL//ExtraConfiguration
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
 FIXME: Should describe the contents of change_ip_setup here, later> 
-FIXME> 
-FIXME> 
-FIXME> 
 FIXME: create link to screenshot> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
-FIXME> 
 ----------------------------------
 https://wiki.debian.org/DebianEdu/Documentation/ITIL//InfrastructureSetup
 FIXME: In with the drawing showing diskless clients> 
diff --git a/documentation/scripts/get_manual b/documentation/scripts/get_manual
index 2117364..65c24da 100755
--- a/documentation/scripts/get_manual
+++ b/documentation/scripts/get_manual
@@ -120,10 +120,10 @@ for i in `cat id` ; do
 	sed "s%<listitem>%\n<listitem>%" |
 	# cut off first lines:
 	sed '1,4d' > $TARGET
-	if [ "$(grep -v FIXMEs $TARGET |grep FIXME |grep -v 'status ignore')" != "" ] ; then
+	if [ "$(grep -v FIXMEs $TARGET | grep FIXME | grep -v 'FIXME>' | grep -v 'status ignore')" != "" ] ; then
 		echo "----------------------------------" >> $TMPFILE
 		echo ${url}${i} >> $TMPFILE
-		grep -v FIXMEs $TARGET | grep FIXME | grep -v 'status ignore' >> $TMPFILE
+		grep -v FIXMEs $TARGET | grep FIXME | grep -v 'FIXME>' | grep -v 'status ignore' >> $TMPFILE
 	fi
 done
 
@@ -168,9 +168,9 @@ xmllint $xmlfile > $TMPFILE2
 mv $TMPFILE2 $xmlfile
 
 # motivate
-if [ "$(grep -v FIXMEs $xmlfile |grep FIXME|grep -v 'status ignore'|uniq)" != "" ] ; then
+if [ "$(grep -v FIXMEs $xmlfile |grep FIXME |grep -v 'status ignore'|uniq)" != "" ] ; then
 	echo "====================" >> $TMPFILE
-	echo `grep -v FIXMEs $xmlfile |grep FIXME|grep -v 'status ignore'|uniq|wc -l` FIXMEs left to fix >> $TMPFILE
+	echo `grep -v FIXMEs $xmlfile |grep FIXME |grep -v 'status ignore'|uniq|wc -l` FIXMEs left to fix >> $TMPFILE
 	echo "====================" >> $TMPFILE
 fi
 mv $TMPFILE fixme-status.txt

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git