Ansgar Burchardt pushed to branch feature/external-signatures at Debian FTP Team / dak
Commits:
-
1e636a29
by Ansgar Burchardt at 2018-04-07T17:16:46+02:00
1 changed file:
Changes:
... | ... | @@ -768,6 +768,7 @@ class NoSourceOnlyCheck(Check): |
768 | 768 |
allow_source_only_uploads = Config().find_b('Dinstall::AllowSourceOnlyUploads')
|
769 | 769 |
allow_source_only_uploads_without_package_list = Config().find_b('Dinstall::AllowSourceOnlyUploadsWithoutPackageList')
|
770 | 770 |
allow_source_only_new = Config().find_b('Dinstall::AllowSourceOnlyNew')
|
771 |
+ allow_source_only_new_keys = Config().value_list('Dinstall::AllowSourceOnlyNewKeys')
|
|
771 | 772 |
allow_no_arch_indep_uploads = Config().find_b('Dinstall::AllowNoArchIndepUploads', True)
|
772 | 773 |
changes = upload.changes
|
773 | 774 |
|
... | ... | @@ -776,7 +777,7 @@ class NoSourceOnlyCheck(Check): |
776 | 777 |
if not allow_source_only_uploads_without_package_list \
|
777 | 778 |
and changes.source.package_list.fallback:
|
778 | 779 |
raise Reject('Source-only uploads are only allowed if a Package-List field that also list architectures is included in the source package. dpkg (>= 1.17.7) includes this information.')
|
779 |
- if not allow_source_only_new and upload.new:
|
|
780 |
+ if not allow_source_only_new and changes.primary_fingerprint not in allow_source_only_new_keys and upload.new:
|
|
780 | 781 |
raise Reject('Source-only uploads to NEW are not allowed.')
|
781 | 782 |
|
782 | 783 |
if 'all' not in changes.architectures and changes.source.package_list.has_arch_indep_packages():
|