summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@gmail.com>2014-11-03 22:56:36 +0100
committerMarc-André Lureau <marcandre.lureau@gmail.com>2014-11-03 22:57:25 +0100
commit41db587bae5a6c4cbc8f40a52bf2d6f25416653f (patch)
tree15e41c125750d08ffc6a81f9273dc5a4d36967f4
parent146e1f7639a131a9f72554a385378e07b07dc76b (diff)
downloadmsitools-41db587bae5a6c4cbc8f40a52bf2d6f25416653f.zip
msitools-41db587bae5a6c4cbc8f40a52bf2d6f25416653f.tar.gz
msitools-41db587bae5a6c4cbc8f40a52bf2d6f25416653f.tar.xz
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.
-rw-r--r--tools/wixl/wixl-heat.vala3
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;