mirror of
https://github.com/EnumeratedDev/bpm.git
synced 2026-09-16 02:26:12 +00:00
Standardized error message formatting
This commit is contained in:
@@ -510,7 +510,7 @@ func extractPackage(pkgInfo *PackageInfo, verbose bool, filename, rootDir string
|
||||
return err, nil
|
||||
}
|
||||
default:
|
||||
return errors.New("ExtractTarGz: unknown type: " + strconv.Itoa(int(header.Typeflag)) + " in " + extractFilename), nil
|
||||
return errors.New("unknown type (" + strconv.Itoa(int(header.Typeflag)) + ") in " + extractFilename), nil
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -644,7 +644,7 @@ func compilePackage(pkgInfo *PackageInfo, filename, rootDir string, verbose, bin
|
||||
fmt.Println("Skipping hard link (Bundling hard links in source packages is not supported)")
|
||||
}
|
||||
default:
|
||||
return errors.New("ExtractTarGz: unknown type: " + strconv.Itoa(int(header.Typeflag)) + " in " + extractFilename), nil
|
||||
return errors.New("unknown type (" + strconv.Itoa(int(header.Typeflag)) + ") in " + extractFilename), nil
|
||||
}
|
||||
}
|
||||
if header.Name == "source.sh" {
|
||||
@@ -994,7 +994,7 @@ func InstallPackage(filename, rootDir string, verbose, force, binaryPkgFromSrc,
|
||||
return errors.New("cannot install a package with a different architecture")
|
||||
}
|
||||
if unresolved := pkgInfo.CheckDependencies(pkgInfo.Type == "source", true, rootDir); len(unresolved) != 0 {
|
||||
return errors.New("Could not resolve all dependencies. Missing " + strings.Join(unresolved, ", "))
|
||||
return errors.New("the following dependencies are not installed: " + strings.Join(unresolved, ", "))
|
||||
}
|
||||
}
|
||||
if pkgInfo.Type == "binary" {
|
||||
@@ -1013,7 +1013,7 @@ func InstallPackage(filename, rootDir string, verbose, force, binaryPkgFromSrc,
|
||||
}
|
||||
files = i
|
||||
} else {
|
||||
return errors.New("Unknown package type: " + pkgInfo.Type)
|
||||
return errors.New("unknown package type: " + pkgInfo.Type)
|
||||
}
|
||||
slices.Sort(files)
|
||||
slices.Reverse(files)
|
||||
|
||||
+1
-1
@@ -138,7 +138,7 @@ func GetRepositoryEntry(str string) (*RepositoryEntry, *Repository, error) {
|
||||
|
||||
func (repo *Repository) FetchPackage(pkg string) (string, error) {
|
||||
if !repo.ContainsPackage(pkg) {
|
||||
return "", errors.New("Could not fetch package '" + pkg + "'")
|
||||
return "", errors.New("could not fetch package '" + pkg + "'")
|
||||
}
|
||||
entry := repo.Entries[pkg]
|
||||
URL, err := url.JoinPath(repo.Source, entry.Download)
|
||||
|
||||
Reference in New Issue
Block a user