summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-10-27 14:56:13 +0200
committerMichał Górny <mgorny@gentoo.org>2017-10-27 15:08:33 +0200
commitca367b0b15001f87c5fdd8fc019eb3f52b72d829 (patch)
treeb97c647dd720574aef9edc161cdf76dd1ee5e487
parent40bb1a8b0d14e7133053c5ec92e512204747c6f7 (diff)
downloadgemato-ca367b0b15001f87c5fdd8fc019eb3f52b72d829.tar.gz
cli: Fix checking subdirectory of Manifest tree
-rw-r--r--gemato/cli.py7
1 files changed, 6 insertions, 1 deletions
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