diff --git a/contrib/packaging/hgpackaging/wix.py b/contrib/packaging/hgpackaging/wix.py --- a/contrib/packaging/hgpackaging/wix.py +++ b/contrib/packaging/hgpackaging/wix.py @@ -165,7 +165,9 @@ if dir_name == '.': parent_directory_id = 'INSTALLDIR' else: - parent_directory_id = 'hg.dir.%s' % dir_name.replace('/', '.') + parent_directory_id = 'hg.dir.%s' % dir_name.replace( + '/', '.' + ).replace('-', '_') fragment = doc.createElement('Fragment') directory_ref = doc.createElement('DirectoryRef') @@ -178,7 +180,9 @@ and '/' not in possible_child and possible_child != '.' ): - child_directory_id = 'hg.dir.%s' % possible_child + child_directory_id = ('hg.dir.%s' % possible_child).replace( + '-', '_' + ) name = possible_child else: if not possible_child.startswith('%s/' % dir_name): @@ -189,7 +193,7 @@ child_directory_id = 'hg.dir.%s' % possible_child.replace( '/', '.' - ) + ).replace('-', '_') directory = doc.createElement('Directory') directory.setAttribute('Id', child_directory_id)