From 5967ea01a7a8015b74a9b12916be4607566f208e Mon Sep 17 00:00:00 2001 From: Thomas Kulik Date: Tue, 21 Apr 2020 09:48:29 +0200 Subject: [PATCH] Issue-ID: DOC-603 fixed a problem with duplicates in rst filenames Signed-off-by: Thomas Kulik Change-Id: I4b230d0627c38fc53fd108324b49e1c6a3bc34e9 --- tools/warnstats.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/warnstats.sh b/tools/warnstats.sh index 338898a90..675884c01 100755 --- a/tools/warnstats.sh +++ b/tools/warnstats.sh @@ -33,6 +33,7 @@ ### ### CHANGELOG (LATEST ON TOP) ### +### 1.6.1 (2020-04-21) - fixed a problem with duplicates in rst filenames ### 1.6.0 (2020-04-03) - extended detection of docs pathes in case they are not ### below the submodules directory ### 1.5.0 (2020-03-23) - doc8 test now executed for every rst file. result is @@ -47,10 +48,10 @@ ### no real onap projects/modules but directories which ### contain additional documentation in rst format). ### 1.3.1 (2020-03-10) - fixed minor typo in usage message -### 1.3.0 (2020-03-09) - initial release +### 1.3.0 (2020-03-09) - initially released to the community ### -script_version="1.6.0 (2020-04-03)" +script_version="1.6.1 (2020-04-21)" doc8_dir=$(pwd)/doc8_results logfile=$1; doc8_command="doc8 --verbose"; #add options if required @@ -217,7 +218,8 @@ do # extract rst file name from line and do some formatting to use it later as an array name #echo "DBUG line: $line"; - rstfile=$(echo "$line" | grep -oP "[\w -]*\.rst"); + rstfile=$(echo "$line" | sed -r 's:, other instance in.*::'); + rstfile=$(echo -e "${rstfile}" | grep -oP "[\w -]*\.rst"); rstfile=$(echo -e ${rstfile} | tr '[:blank:]' '_'); #echo "DBUG rst-file: $rstfile"; -- 2.16.6