Browse Source

Fix cleanup tools

Adjust for manual move
Do not assume that tmpfile and target are on the same filesystem and
use copy instead of rename.

Change-Id: Ide16e541032f5bcc3ea462a9347faebdc5d7d670
tags/0.1
Andreas Jaeger 6 years ago
parent
commit
ff2aba90a4
2 changed files with 5 additions and 5 deletions
  1. +1
    -1
      cleanup/remove_trailing_whitespaces.sh
  2. +4
    -4
      cleanup/remove_unnecessary_spaces.py

+ 1
- 1
cleanup/remove_trailing_whitespaces.sh View File

@@ -7,7 +7,7 @@
# Call ./tools/cleanup/remove_trailing_whitespaces.sh in the
# root of openstack-manuals.

files=$(find doc/src/docbkx -name *.xml -not -name pom.xml)
files=$(find doc -name *.xml -not -name pom.xml)
for file in $files; do
sed -i -e 's/[[:space:]]*$//' $file
done

+ 4
- 4
cleanup/remove_unnecessary_spaces.py View File

@@ -10,6 +10,7 @@
import os
import re
import tempfile
import shutil

# should be the same like in tools/validate.py
FILE_EXCEPTIONS = ['ha-guide-docinfo.xml','bk001-ch003-associate-general.xml']
@@ -33,7 +34,7 @@ for element in elements:
checks.append(re.compile("(.*<%s>)\s+([\w\-().:!?{}\[\]]+.*\n)" % element)),
checks.append(re.compile("(.*[\w\-().:!?{}\[\]]+)\s+(<\/%s>.*\n)" % element))

for root, dirs, files in os.walk('doc/src/docbkx/'):
for root, dirs, files in os.walk('doc/'):
for f in files:
if (not (f.endswith('.xml') and
f != 'pom.xml' and
@@ -51,6 +52,5 @@ for root, dirs, files in os.walk('doc/src/docbkx/'):
tmpfd.write(line)
tmpfd.close()
if match:
os.rename(tmpfile[1], docfile)
else:
os.unlink(tmpfile[1])
shutil.copyfile(tmpfile[1], docfile)
os.unlink(tmpfile[1])

Loading…
Cancel
Save