Skip to content

Commit 2b8edc4

Browse files
winstone77winstone77
authored andcommitted
Fix Manifest merging issue (#292)
Co-authored-by: winstone77 <[email protected]>
1 parent 02b86e1 commit 2b8edc4

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

workload/src/Samsung.Tizen.Build.Tasks/MergeManifest.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public override bool Execute()
4444

4545
var mainDoc = XDocument.Load(MainManifestFile);
4646
var ns = mainDoc.Root.GetDefaultNamespace();
47+
string previousSubManifestSpec = null;
4748

4849
//Merge sub manifest to base manifest
4950
foreach (var subManifest in subManifestFileList)
@@ -54,9 +55,16 @@ public override bool Execute()
5455
return !Log.HasLoggedErrors;
5556
}
5657

58+
if (previousSubManifestSpec != null && previousSubManifestSpec == subManifest.ItemSpec)
59+
{
60+
Log.LogMessage(MessageImportance.High, "Skipping duplicate sub manifest file : {0}", subManifest.ItemSpec);
61+
continue;
62+
}
63+
5764
var subDoc = XDocument.Load(subManifest.ItemSpec);
5865

5966
var subElemList = subDoc.Root.Elements();
67+
6068
foreach (var subapp in subElemList)
6169
{
6270
if (subapp.Name.LocalName == "ui-application" ||
@@ -95,6 +103,7 @@ public override bool Execute()
95103
mainDoc.Root.Add(subapp);
96104
}
97105
}
106+
previousSubManifestSpec = subManifest.ItemSpec;
98107
}
99108

100109
// Remove duplicate privilege

0 commit comments

Comments
 (0)