chore(keyringctl): use singular for packager directory as well

So far we have used singular for all directories, lets keep that for the
packager directory as well.
This commit is contained in:
Levente Polyak 2021-10-20 01:34:44 +02:00
parent 37d0a5f633
commit 48e9bb67cb
No known key found for this signature in database
GPG Key ID: FC1B547C8D8172C8
2 changed files with 6 additions and 6 deletions

View File

@ -7,7 +7,7 @@ of the distribution.
The PGP packets describing the main signing keys can be found below the The PGP packets describing the main signing keys can be found below the
[main](main) directory, while those of the packagers are located below the [main](main) directory, while those of the packagers are located below the
[packagers](packagers) directory. [packager](packager) directory.
## Requirements ## Requirements

View File

@ -1157,7 +1157,7 @@ if __name__ == "__main__":
export_keyring_parser = subcommands.add_parser( export_keyring_parser = subcommands.add_parser(
"export-keyring", "export-keyring",
help="export PGP packet data below main/ and packagers/ to output/archlinux.gpg alongside pacman integration", help="export PGP packet data below main/ and packager/ to output/archlinux.gpg alongside pacman integration",
) )
export_parser = subcommands.add_parser( export_parser = subcommands.add_parser(
@ -1211,7 +1211,7 @@ if __name__ == "__main__":
name_override=args.name, name_override=args.name,
fingerprint_filter=get_fingerprints( fingerprint_filter=get_fingerprints(
working_dir=working_dir, working_dir=working_dir,
decomposed_paths=[keyring_root / "main", keyring_root / "packagers"], decomposed_paths=[keyring_root / "main", keyring_root / "packager"],
), ),
) )
) )
@ -1220,11 +1220,11 @@ if __name__ == "__main__":
convert( convert(
working_dir=working_dir, working_dir=working_dir,
source=args.source, source=args.source,
target_dir=keyring_root / "packagers", target_dir=keyring_root / "packager",
name_override=args.name, name_override=args.name,
fingerprint_filter=get_fingerprints( fingerprint_filter=get_fingerprints(
working_dir=working_dir, working_dir=working_dir,
decomposed_paths=[keyring_root / "main", keyring_root / "packagers"], decomposed_paths=[keyring_root / "main", keyring_root / "packager"],
), ),
) )
) )
@ -1232,7 +1232,7 @@ if __name__ == "__main__":
export_keyring( export_keyring(
working_dir=working_dir, working_dir=working_dir,
main=[keyring_root / "main"], main=[keyring_root / "main"],
sources=[keyring_root / "packagers"], sources=[keyring_root / "packager"],
output=keyring_root / "output" / "archlinux.gpg", output=keyring_root / "output" / "archlinux.gpg",
force=True, force=True,
pacman_integration=True, pacman_integration=True,