package-indexer: expand absolute path for gpg-key-path

This is not strictly necessary as we set an absolute path in the config, but it is a nice feature, I think. Signed-off-by: Attila Szakacs <[email protected]>
axoflow · Jul 2, 2024 · c9a34f9 · c9a34f9
1 parent f4e8b27
commit c9a34f9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/packaging/package-indexer/config/config.py b/packaging/package-indexer/config/config.py
@@ -138,7 +138,7 @@ def create_cdn(self, suite: str) -> cdn.CDN:
         return cls.from_config(options)
 
     def get_gpg_key_path(self) -> Path:
-        return self.__cfg["gpg-key-path"]
+        return Path(self.__cfg["gpg-key-path"]).expanduser().absolute()
 
     @staticmethod
     def __get_storage_implementation(vendor: str) -> Type[remote_storage_synchronizer.RemoteStorageSynchronizer]:

diff --git a/packaging/package-indexer/index-packages.py b/packaging/package-indexer/index-packages.py
@@ -117,7 +117,7 @@ def construct_indexers(cfg: Config, args: dict) -> List[Indexer]:
     indexed_remote_storage_synchronizer = cfg.create_indexed_remote_storage_synchronizer(suite)
     cdn = cfg.create_cdn(suite)
 
-    gpg_key_path = Path(cfg.get_gpg_key_path())
+    gpg_key_path = cfg.get_gpg_key_path()
     gpg_key_passphrase = stdin.read() if args["gpg_key_passphrase_from_stdin"] else None
 
     indexers: List[Indexer] = []

diff --git a/packaging/package-indexer/indexer/deb_indexer.py b/packaging/package-indexer/indexer/deb_indexer.py
@@ -51,7 +51,7 @@ def __init__(
         gpg_key_passphrase: Optional[str],
     ) -> None:
         self.__apt_conf_file_path = apt_conf_file_path
-        self.__gpg_key_path = gpg_key_path.expanduser()
+        self.__gpg_key_path = gpg_key_path
         self.__gpg_key_passphrase = gpg_key_passphrase
         super().__init__(
             incoming_remote_storage_synchronizer=incoming_remote_storage_synchronizer,