Make trusted-keys paths in manifest relative to manifest

bootstrapvz/base/manifest-schema.yml

@@ -121,7 +121,7 @@ properties:
       trusted-keys:
         type: array
         items:
-          $ref: '#/definitions/absolute_path'
+          $ref: '#/definitions/path'
         minItems: 1
       include-source-type: {type: boolean}
     additionalProperties: false

bootstrapvz/common/tasks/apt.py

@@ -1,6 +1,7 @@
 from bootstrapvz.base import Task
 from bootstrapvz.common import phases
 from bootstrapvz.common.tools import log_check_call
+from bootstrapvz.common.tools import rel_path
 import locale
 import logging
 import os
@@ -14,7 +15,8 @@ class ValidateTrustedKeys(Task):
     def run(cls, info):
         from bootstrapvz.common.tools import log_call
 
-        for i, key_path in enumerate(info.manifest.packages.get('trusted-keys', {})):
+        for i, rel_key_path in enumerate(info.manifest.packages.get('trusted-keys', {})):
+            key_path = rel_path(info.manifest.path, rel_key_path)
             if not os.path.isfile(key_path):
                 info.manifest.validation_error('File not found: {}'.format(key_path),
                                                ['packages', 'trusted-keys', i])
@@ -108,7 +110,8 @@ class InstallTrustedKeys(Task):
     @classmethod
     def run(cls, info):
         from shutil import copy
-        for key_path in info.manifest.packages['trusted-keys']:
+        for rel_key_path in info.manifest.packages['trusted-keys']:
+            key_path = rel_path(info.manifest.path, rel_key_path)
             key_name = os.path.basename(key_path)
             destination = os.path.join(info.root, 'etc/apt/trusted.gpg.d', key_name)
             copy(key_path, destination)

manifests/README.rst

@@ -206,8 +206,8 @@ variety of sources.
    default apt sources. For example ``contrib`` or ``non-free``
    ``optional``
    Default: ``['main']``
--  ``trusted-keys``: List of paths to ``.gpg`` keyrings that should
-   be added to the aptitude keyring of trusted signatures for
+-  ``trusted-keys``: List of paths (relative to the manifest) to ``.gpg`` keyrings
+   that should be added to the aptitude keyring of trusted signatures for
    repositories.
    ``optional``
 -  ``apt.conf.d``: A map of ``apt.conf(5)`` configuration snippets.
@@ -303,7 +303,7 @@ boot, root and swap.
    -  ``{device_path}``: The device path of the partition.
    -  ``{size}``: The size of the partition.
    -  ``{mount_opts}``: Options to mount the partition with. This optional
-      setting overwrites the default option list bootstrap-vz would 
+      setting overwrites the default option list bootstrap-vz would
       normally use to mount the partiton (defaults). The List is specified
       as a string array where each option/argument is an item in that array.
       ``optional`` Here some examples:
@@ -315,7 +315,7 @@ boot, root and swap.
    The default command used by bootstrap-vz is
    ``['mkfs.{fs}', '{device_path}']``.
 
-   -  ``boot``: Configuration of the boot partition. All settings equal 
+   -  ``boot``: Configuration of the boot partition. All settings equal
       those of the root partition.
       ``optional``
    -  ``swap``: Configuration of the swap partition. Since the swap