File tree Expand file tree Collapse file tree 1 file changed +9
-0
lines changed
workload/src/Samsung.Tizen.Build.Tasks Expand file tree Collapse file tree 1 file changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -44,6 +44,7 @@ public override bool Execute()
44
44
45
45
var mainDoc = XDocument . Load ( MainManifestFile ) ;
46
46
var ns = mainDoc . Root . GetDefaultNamespace ( ) ;
47
+ string previousSubManifestSpec = null ;
47
48
48
49
//Merge sub manifest to base manifest
49
50
foreach ( var subManifest in subManifestFileList )
@@ -54,9 +55,16 @@ public override bool Execute()
54
55
return ! Log . HasLoggedErrors ;
55
56
}
56
57
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
+
57
64
var subDoc = XDocument . Load ( subManifest . ItemSpec ) ;
58
65
59
66
var subElemList = subDoc . Root . Elements ( ) ;
67
+
60
68
foreach ( var subapp in subElemList )
61
69
{
62
70
if ( subapp . Name . LocalName == "ui-application" ||
@@ -95,6 +103,7 @@ public override bool Execute()
95
103
mainDoc . Root . Add ( subapp ) ;
96
104
}
97
105
}
106
+ previousSubManifestSpec = subManifest . ItemSpec ;
98
107
}
99
108
100
109
// Remove duplicate privilege
You can’t perform that action at this time.
0 commit comments