mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-20 05:08:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

More changes triggered by removing the typealiases of MunkiError

Browse Source
This commit is contained in:
Greg Neagle
2024-09-03 11:21:43 -07:00
parent db5f711b79
commit c98a1fa18f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/cli/munki/munkiimport/munkiimport.swift
+5 -5
View File
@@ -164,7 +164,7 @@ struct MunkiImport: AsyncParsableCommand {
var repo: Repo
do {
repo = try repoConnect(url: repoURL, plugin: plugin)
} catch let error as RepoError {
} catch let error as MunkiError {
printStderr("Repo connection error: \(error.description)")
throw ExitCode(-1)
}
@@ -329,7 +329,7 @@ struct MunkiImport: AsyncParsableCommand {
{
do {
let _ = try convertAndInstallIcon(repo, name: name, iconPath: iconPath)
} catch let error as MunkiImportError {
} catch let error as MunkiError {
printStderr("Error importing \(iconPath): \(error.description)")
}
} else if !munkiImportOptions.extractIcon,
@@ -352,7 +352,7 @@ struct MunkiImport: AsyncParsableCommand {
} else {
print("No icons found for import.")
}
} catch let error as MunkiImportError {
} catch let error as MunkiError {
printStderr("Error importing icons: \(error.description)")
} catch {
printStderr("Error importing icons: \(error)")
@@ -367,7 +367,7 @@ struct MunkiImport: AsyncParsableCommand {
let version = pkginfo["version"] as? String ?? "UNKNOWN"
uploadedPkgPath = try copyInstallerItemToRepo(repo, itempath: installerItem, version: version, subdirectory: subdir)
print("Copied \(installerItemName) to \(uploadedPkgPath).")
} catch let error as MunkiImportError {
} catch let error as MunkiError {
printStderr("Error importing \(installerItem): \(error.description)")
throw ExitCode(-1)
} catch {
@@ -384,7 +384,7 @@ struct MunkiImport: AsyncParsableCommand {
let version = pkginfo["version"] as? String ?? "UNKNOWN"
uploadedPkgPath = try copyInstallerItemToRepo(repo, itempath: uninstallerItem, version: version, subdirectory: subdir)
print("Copied \(uninstallerItemName) to \(uploadedPkgPath).")
} catch let error as MunkiImportError {
} catch let error as MunkiError {
printStderr("Error importing \(uninstallerItem): \(error.description)")
throw ExitCode(-1)
} catch {