mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 14:43:37 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
22 lines
622 B
Diff
22 lines
622 B
Diff
--- a/client/clienterror/matcher.go
|
|
+++ b/client/clienterror/matcher.go
|
|
@@ -2,6 +2,7 @@ package clienterror
|
|
|
|
import (
|
|
"crypto/x509"
|
|
+ "errors"
|
|
"net/http"
|
|
|
|
"github.com/giantswarm/microerror"
|
|
@@ -101,9 +102,7 @@ func IsServiceUnavailableError(err error) bool {
|
|
// a x509.UnknownAuthorityError
|
|
func IsCertificateSignedByUnknownAuthorityError(err error) bool {
|
|
if clientErr, ok := err.(*APIError); ok {
|
|
- if _, certErrorOK := clientErr.OriginalError.(x509.UnknownAuthorityError); certErrorOK {
|
|
- return true
|
|
- }
|
|
+ return errors.As(clientErr.OriginalError, &x509.UnknownAuthorityError{})
|
|
}
|
|
|
|
return false
|