Commit acc377e3 authored by Drew's avatar Drew

Softfail by default

Use softfail setting for importing remote packages.  This resolves issues such as

fatal error: Can't find overlay named NaOH.link in [:]: file atpkg/src/Package.swift, line 375

(when it is not required as it's a test-only dependency)
parent e149e55c
Pipeline #2900 passed with stage
in 38 seconds
...@@ -190,7 +190,7 @@ final public class Package { ...@@ -190,7 +190,7 @@ final public class Package {
- parameter overlay: A list of overlays to apply globally to all tasks in the package. - parameter overlay: A list of overlays to apply globally to all tasks in the package.
- parameter focusOnTask: The user has "selected" the particular task. We provide more diagnostics for this task. - parameter focusOnTask: The user has "selected" the particular task. We provide more diagnostics for this task.
*/ */
public convenience init(filepath: Path, overlay: [String], focusOnTask: String?, softFail: Bool = false) throws { public convenience init(filepath: Path, overlay: [String], focusOnTask: String?, softFail: Bool = true) throws {
//todo: why doesn't this throw? //todo: why doesn't this throw?
guard let parser = try Parser(filepath: filepath) else { guard let parser = try Parser(filepath: filepath) else {
...@@ -313,7 +313,7 @@ final public class Package { ...@@ -313,7 +313,7 @@ final public class Package {
// import the atbuild file if it is there // import the atbuild file if it is there
let adjustedImportPath = (pathOnDisk + importFileString).dirname() let adjustedImportPath = (pathOnDisk + importFileString).dirname()
do { do {
let remotePackage = try Package(filepath: pathOnDisk + importFileString, overlay: requestedGlobalOverlays, focusOnTask: nil) let remotePackage = try Package(filepath: pathOnDisk + importFileString, overlay: requestedGlobalOverlays, focusOnTask: nil, softFail: softFail)
remotePackage.adjustedImportPath = adjustedImportPath remotePackage.adjustedImportPath = adjustedImportPath
remotePackages.append(remotePackage) remotePackages.append(remotePackage)
} catch { } catch {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment