[msitools] wixl-heat: do not escape sourcedir, fix 9273514c9 regression
- From: Marc-Andre Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [msitools] wixl-heat: do not escape sourcedir, fix 9273514c9 regression
- Date: Mon, 24 Jul 2017 12:54:52 +0000 (UTC)
commit 4ae71a7a7b5d4d8e59c9efe4e1e0251cd59eaa11
Author: Marc-André Lureau <marcandre lureau redhat com>
Date: Mon Jul 24 10:59:17 2017 +0100
wixl-heat: do not escape sourcedir, fix 9273514c9 regression
Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>
tools/wixl/wixl-heat.vala | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/tools/wixl/wixl-heat.vala b/tools/wixl/wixl-heat.vala
index 47013c1..4c828f7 100644
--- a/tools/wixl/wixl-heat.vala
+++ b/tools/wixl/wixl-heat.vala
@@ -106,8 +106,8 @@ public int main (string[] args) {
stdout.printf (indent + "<Component Win64=\"$(var.Win64)\" Id=\"%s\"
Guid=\"*\">\n".printf (id));
else
stdout.printf (indent + "<Component Id=\"%s\" Guid=\"*\">\n".printf (id));
- file = sourcedir + Path.DIR_SEPARATOR_S + file;
- stdout.printf (indent + " <File Id=\"%s\" KeyPath=\"yes\" Source=\"%s\"/>\n".printf
(generate_id ("fil", 1, file), escape_filename(file)));
+ file = sourcedir + Path.DIR_SEPARATOR_S + escape_filename(file);
+ stdout.printf (indent + " <File Id=\"%s\" KeyPath=\"yes\" Source=\"%s\"/>\n".printf
(generate_id ("fil", 1, file), file));
stdout.printf (indent + "</Component>\n");
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]