Latest
This commit is contained in:
parent
c71e272c9d
commit
6a730b1d47
1 changed files with 4 additions and 4 deletions
|
@ -188,6 +188,7 @@ async function generateInstallOrders(pkgsToInstall) {
|
||||||
if (doubleScoped) {
|
if (doubleScoped) {
|
||||||
try {
|
try {
|
||||||
await $doubleScoped
|
await $doubleScoped
|
||||||
|
processPluginOrders(pkg)
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let pref
|
let pref
|
||||||
if (softwarePackages[packageKey]['_' + currentSelector + ':' + preference + ':' + osID]) {
|
if (softwarePackages[packageKey]['_' + currentSelector + ':' + preference + ':' + osID]) {
|
||||||
|
@ -200,21 +201,21 @@ async function generateInstallOrders(pkgsToInstall) {
|
||||||
pref = osType + ':' + preference
|
pref = osType + ':' + preference
|
||||||
}
|
}
|
||||||
log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`)
|
log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`)
|
||||||
processPluginOrders(pkg)
|
|
||||||
continue pkgFor
|
continue pkgFor
|
||||||
}
|
}
|
||||||
} else if (scopedPkgManager) {
|
} else if (scopedPkgManager) {
|
||||||
try {
|
try {
|
||||||
await $scopedPkgManager
|
await $scopedPkgManager
|
||||||
|
processPluginOrders(pkg)
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
const pref = preference
|
const pref = preference
|
||||||
log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`)
|
log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`)
|
||||||
processPluginOrders(pkg)
|
|
||||||
continue pkgFor
|
continue pkgFor
|
||||||
}
|
}
|
||||||
} else if (scopedSystem) {
|
} else if (scopedSystem) {
|
||||||
try {
|
try {
|
||||||
await $scopedSystem
|
await $scopedSystem
|
||||||
|
processPluginOrders(pkg)
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let pref
|
let pref
|
||||||
if (softwarePackages[packageKey]['_' + currentSelector + ':' + osID]) {
|
if (softwarePackages[packageKey]['_' + currentSelector + ':' + osID]) {
|
||||||
|
@ -223,15 +224,14 @@ async function generateInstallOrders(pkgsToInstall) {
|
||||||
pref = osType
|
pref = osType
|
||||||
}
|
}
|
||||||
log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`)
|
log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`)
|
||||||
processPluginOrders(pkg)
|
|
||||||
continue pkgFor
|
continue pkgFor
|
||||||
}
|
}
|
||||||
} else if (normalCheck) {
|
} else if (normalCheck) {
|
||||||
try {
|
try {
|
||||||
await $normalCheck
|
await $normalCheck
|
||||||
|
processPluginOrders(pkg)
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
log('info', 'Filter', `${pkg} is being skipped because of the _when condition`)
|
log('info', 'Filter', `${pkg} is being skipped because of the _when condition`)
|
||||||
processPluginOrders(pkg)
|
|
||||||
continue pkgFor
|
continue pkgFor
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue