Skip to content

Commit 157134a

Browse files
winstone77winstone77
authored andcommitted
fix FamilyHub manifest merging issue (#295)
Co-authored-by: winstone77 <seok.oh@samsung.com>
1 parent 7787d32 commit 157134a

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ public override bool Execute()
3838
Log.LogMessage(MessageImportance.High, "Base manifest file : {0}", MainManifestFile);
3939

4040
foreach (var subManifest in subManifestFileList)
41-
Log.LogMessage(MessageImportance.High, "Sub manifest file : {0}", subManifest.ItemSpec);
41+
Log.LogMessage(MessageImportance.High, "Sub manifest file new : {0}", subManifest.ItemSpec);
4242

43-
Log.LogMessage(MessageImportance.High, "Result manifest file : {0}", ResultManifestFile);
43+
Log.LogMessage(MessageImportance.High, "Result manifest file new : {0}", ResultManifestFile);
4444

4545
var mainDoc = XDocument.Load(MainManifestFile);
4646
var ns = mainDoc.Root.GetDefaultNamespace();
47-
string previousSubManifestSpec = null;
47+
var processedManifests = new List<string>();
4848

4949
//Merge sub manifest to base manifest
5050
foreach (var subManifest in subManifestFileList)
@@ -55,7 +55,8 @@ public override bool Execute()
5555
return !Log.HasLoggedErrors;
5656
}
5757

58-
if (previousSubManifestSpec != null && previousSubManifestSpec == subManifest.ItemSpec)
58+
59+
if (processedManifests.Contains(subManifest.ItemSpec))
5960
{
6061
Log.LogMessage(MessageImportance.High, "Skipping duplicate sub manifest file : {0}", subManifest.ItemSpec);
6162
continue;
@@ -103,7 +104,7 @@ public override bool Execute()
103104
mainDoc.Root.Add(subapp);
104105
}
105106
}
106-
previousSubManifestSpec = subManifest.ItemSpec;
107+
processedManifests.Add(subManifest.ItemSpec);
107108
}
108109

109110
// Remove duplicate privilege
@@ -168,4 +169,4 @@ public int Compare(XElement x, XElement y)
168169
return x_order - y_order;
169170
}
170171
}
171-
}
172+
}

0 commit comments

Comments
 (0)