[msitools] Revert "wixl-heat: generate stable dir id"
- From: Marc-Andre Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [msitools] Revert "wixl-heat: generate stable dir id"
- Date: Mon, 3 Nov 2014 21:57:46 +0000 (UTC)
commit 41db587bae5a6c4cbc8f40a52bf2d6f25416653f
Author: Marc-André Lureau <marcandre lureau gmail com>
Date: Mon Nov 3 22:56:36 2014 +0100
Revert "wixl-heat: generate stable dir id"
This reverts commit afc18dcd98d5a67d21ef237c25221a71b01df1b2.
Stable dir id will conflict with different libraries/components, it's a
bad idea.
tools/wixl/wixl-heat.vala | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
---
diff --git a/tools/wixl/wixl-heat.vala b/tools/wixl/wixl-heat.vala
index 7aeff92..3be1080 100644
--- a/tools/wixl/wixl-heat.vala
+++ b/tools/wixl/wixl-heat.vala
@@ -90,8 +90,7 @@ public int main (string[] args) {
}
}
for (; i < path.length; i++) {
- last_path += path[i];
- stdout.printf (indent + "<Directory Id=\"%s\" Name=\"%s\">\n".printf (generate_id("dir", 1,
string.joinv("/", last_path)), path[i]));
+ stdout.printf (indent + "<Directory Id=\"%s\" Name=\"%s\">\n".printf (random_id ("dir"),
path[i]));
indent += " ";
}
last_path = path;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]