Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix FamilyHub manifest merging issue #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoonghyunCho merged 2 commits into from
Aug 4, 2025
Merged

fix FamilyHub manifest merging issue #295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d591002
fix FamilyHub manifest merging issue
Jul 9, 2025
7c3377d
Merge branch 'main' into fix_manifest_merging_issue
winstone77 Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions workload/src/Samsung.Tizen.Build.Tasks/MergeManifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ public override bool Execute()
Log.LogMessage(MessageImportance.High, "Base manifest file : {0}", MainManifestFile);

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

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

var mainDoc = XDocument.Load(MainManifestFile);
var ns = mainDoc.Root.GetDefaultNamespace();
string previousSubManifestSpec = null;
var processedManifests = new List<string>();

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

if (previousSubManifestSpec != null && previousSubManifestSpec == subManifest.ItemSpec)

if (processedManifests.Contains(subManifest.ItemSpec))
{
Log.LogMessage(MessageImportance.High, "Skipping duplicate sub manifest file : {0}", subManifest.ItemSpec);
continue;
Expand Down Expand Up @@ -103,7 +104,7 @@ public override bool Execute()
mainDoc.Root.Add(subapp);
}
}
previousSubManifestSpec = subManifest.ItemSpec;
processedManifests.Add(subManifest.ItemSpec);
}

// Remove duplicate privilege
Expand Down Expand Up @@ -168,4 +169,4 @@ public int Compare(XElement x, XElement y)
return x_order - y_order;
}
}
}
}