Skip to content

Fix/improve dependency handling #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Urist-McGit merged 1 commit into from
Oct 13, 2025
Merged

Fix/improve dependency handling #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions src/debsbom/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from .dpkg import package
from .generate import Debsbom, SBOMType
from . import HAS_PYTHON_APT
from .util import Compression

# Keep the set of required deps to a bare minimum, needed for SBOM generation
try:
Expand All @@ -33,11 +34,11 @@
)
from .snapshot import client as sdlclient
from .repack import Packer, BomTransformer
from .util import Compression

HAS_DOWNLOAD_DEPS = True
except ModuleNotFoundError:
except ModuleNotFoundError as e:
HAS_DOWNLOAD_DEPS = False
MISSING_MODULE = e

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -438,20 +439,15 @@ def setup_parser():
help="report progress",
action="store_true",
)
subparser = parser.add_subparsers(help="sub command help", dest="cmd")
subparser = parser.add_subparsers(help="sub command help", dest="cmd", required=True)
GenerateCmd.setup_parser(
subparser.add_parser("generate", help="generate a SBOM for a Debian system")
)

if HAS_DOWNLOAD_DEPS:
DownloadCmd.setup_parser(
subparser.add_parser("download", help="download referenced packages")
)
MergeCmd.setup_parser(
subparser.add_parser("source-merge", help="merge referenced source packages")
)
RepackCmd.setup_parser(subparser.add_parser("repack", help="repack sources and sbom"))

DownloadCmd.setup_parser(subparser.add_parser("download", help="download referenced packages"))
MergeCmd.setup_parser(
subparser.add_parser("source-merge", help="merge referenced source packages")
)
RepackCmd.setup_parser(subparser.add_parser("repack", help="repack sources and sbom"))
return parser


Expand All @@ -474,6 +470,8 @@ def main():
try:
if args.cmd == "generate":
GenerateCmd.run(args)
elif not HAS_DOWNLOAD_DEPS:
raise RuntimeError(f"{MISSING_MODULE}. {args.cmd} not available")
elif args.cmd == "download":
DownloadCmd.run(args)
elif args.cmd == "source-merge":
Expand Down