From ca367b0b15001f87c5fdd8fc019eb3f52b72d829 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Fri, 27 Oct 2017 14:56:13 +0200 Subject: cli: Fix checking subdirectory of Manifest tree --- gemato/cli.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gemato/cli.py b/gemato/cli.py index 08765b6..0529fc9 100644 --- a/gemato/cli.py +++ b/gemato/cli.py @@ -8,6 +8,7 @@ from __future__ import print_function import argparse import io import logging +import os.path import timeit import gemato.find_top_level @@ -57,8 +58,12 @@ def do_verify(args): if args.require_signed_manifest and not m.openpgp_signed: logging.error('Top-level Manifest {} is not OpenPGP signed'.format(tlm)) return 1 + + relpath = os.path.relpath(p, os.path.dirname(tlm)) + if relpath == '.': + relpath = '' try: - ret = m.assert_directory_verifies(**kwargs) + ret = m.assert_directory_verifies(relpath, **kwargs) except gemato.exceptions.ManifestMismatch as e: logging.error(str(e)) return 1 -- cgit v1.2.3