summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Wagner <david.wagner@intel.com>2014-10-03 10:48:05 +0200
committerMattijs Korpershoek <mattijsx.korpershoek@intel.com>2014-10-03 17:33:20 +0200
commit168c3107d6e487dfc0597ce45637d698ed9a29a8 (patch)
tree996978433e2cf8a23d240834a37916fdcc53edb8
parentf811b7b53c0c2f0d4320c70230e609619c5087c1 (diff)
downloadexternal_parameter-framework-168c3107d6e487dfc0597ce45637d698ed9a29a8.zip
external_parameter-framework-168c3107d6e487dfc0597ce45637d698ed9a29a8.tar.gz
external_parameter-framework-168c3107d6e487dfc0597ce45637d698ed9a29a8.tar.bz2
hostDomainGenerator: Fix the stripping of the temporary directory name
We didn't properly remove the name of the temporary directory in the generated files which caused two generation from identical sources result in different generated files. We know the full name of the temporary directory so we can simply completly remove it from the generated file. Issue: GMINL-1953 Change-Id: I1f360cea249328d30318a24643b524c87424475e Signed-off-by: David Wagner <david.wagner@intel.com>
-rwxr-xr-xtools/xmlGenerator/hostDomainGenerator.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/xmlGenerator/hostDomainGenerator.sh b/tools/xmlGenerator/hostDomainGenerator.sh
index 4cfce4d..fe02048 100755
--- a/tools/xmlGenerator/hostDomainGenerator.sh
+++ b/tools/xmlGenerator/hostDomainGenerator.sh
@@ -313,5 +313,5 @@ m4 "$@" |
$PFWSendCommand getDomainsWithSettingsXML |
# Delete trailing carriage return and format absolute paths
sed -r -e 's/\r$//' \
- -e 's/(xsi:noNamespaceSchemaLocation=")[^"]*tmp/\1/' >&4
+ -e 's@(xsi:noNamespaceSchemaLocation=")'"$tmpDir"'/?@\1@' >&4