Skip to content

Commit

Permalink
follow exit suggestions
Browse files Browse the repository at this point in the history
Signed-off-by: Janine Olear <[email protected]>
  • Loading branch information
miyunari committed Mar 2, 2025
1 parent cc3f10f commit 9f92044
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
7 changes: 4 additions & 3 deletions src/sign.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import argparse
import logging
import pathlib
import sys

from model_signing import model
from model_signing.hashing import file
Expand Down Expand Up @@ -148,13 +149,13 @@ def _get_payload_signer(args: argparse.Namespace) -> signing.Signer:
log.error(
'supported methods: ["pki", "private-key", "sigstore", "skip"]'
)
exit(-1)
sys.exit(1)


def _check_private_key_options(args: argparse.Namespace):
if args.key_path == "":
log.error("--private_key must be set to a valid private key PEM file")
exit()
sys.exit()


def _check_pki_options(args: argparse.Namespace):
Expand All @@ -166,7 +167,7 @@ def _check_pki_options(args: argparse.Namespace):
"PEM encoded signing certificate",
)
)
exit()
sys.exit()
if args.cert_chain_path == "":
log.warning("No certificate chain provided")

Expand Down
8 changes: 4 additions & 4 deletions src/verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

import argparse
import logging
import os
import pathlib
import sys

from model_signing import model
from model_signing.hashing import file
Expand Down Expand Up @@ -119,13 +119,13 @@ def _get_verifier(args: argparse.Namespace) -> signing.Verifier:
log.error(
'supported methods: ["pki", "private-key", "sigstore", "skip"]'
)
exit(-1)
sys.exit(1)


def _check_private_key_flags(args: argparse.Namespace):
if args.key == "":
log.error("--public_key must be defined")
exit()
sys.exit()


def _check_pki_flags(args: argparse.Namespace):
Expand Down Expand Up @@ -169,7 +169,7 @@ def hasher_factory(file_path: pathlib.Path) -> file.FileHasher:
)
except verifying.VerificationError as err:
log.error(f"verification failed: {err}")
os._exit(-1)
sys.exit(1)

log.info("all checks passed")

Expand Down

0 comments on commit 9f92044

Please sign in to comment.