Ansgar pushed to branch deploy at Debian FTP Team / dak
Commits:
4 changed files:
Changes:
| ... | ... | @@ -176,6 +176,7 @@ Urgency |
| 176 | 176 |
};
|
| 177 | 177 |
|
| 178 | 178 |
Include {
|
| 179 |
+ "/srv/security-master.debian.org/dak/config/debian/common.conf";
|
|
| 179 | 180 |
"/srv/security-master.debian.org/dak/config/debian/external-signatures.conf";
|
| 180 | 181 |
};
|
| 181 | 182 |
|
| 1 |
+// DAK configuration common between main and security archives
|
|
| 2 |
+ |
|
| 3 |
+Dinstall::AllowSourceOnlyNewSources {
|
|
| 4 |
+ "linux";
|
|
| 5 |
+};
|
| ... | ... | @@ -298,6 +298,7 @@ Command::DM-Admin { |
| 298 | 298 |
};
|
| 299 | 299 |
|
| 300 | 300 |
Include {
|
| 301 |
+ "/srv/ftp-master.debian.org/dak/config/debian/common.conf";
|
|
| 301 | 302 |
"/srv/ftp-master.debian.org/dak/config/debian/external-signatures.conf";
|
| 302 | 303 |
};
|
| 303 | 304 |
|
| ... | ... | @@ -821,6 +821,7 @@ class NoSourceOnlyCheck(Check): |
| 821 | 821 |
allow_source_only_uploads_without_package_list = Config().find_b('Dinstall::AllowSourceOnlyUploadsWithoutPackageList')
|
| 822 | 822 |
allow_source_only_new = Config().find_b('Dinstall::AllowSourceOnlyNew')
|
| 823 | 823 |
allow_source_only_new_keys = Config().value_list('Dinstall::AllowSourceOnlyNewKeys')
|
| 824 |
+ allow_source_only_new_sources = Config().value_list('Dinstall::AllowSourceOnlyNewSources')
|
|
| 824 | 825 |
allow_no_arch_indep_uploads = Config().find_b('Dinstall::AllowNoArchIndepUploads', True)
|
| 825 | 826 |
changes = upload.changes
|
| 826 | 827 |
|
| ... | ... | @@ -829,7 +830,9 @@ class NoSourceOnlyCheck(Check): |
| 829 | 830 |
if not allow_source_only_uploads_without_package_list \
|
| 830 | 831 |
and changes.source.package_list.fallback:
|
| 831 | 832 |
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.')
|
| 832 |
- if not allow_source_only_new and changes.primary_fingerprint not in allow_source_only_new_keys and upload.new:
|
|
| 833 |
+ if not allow_source_only_new and upload.new \
|
|
| 834 |
+ and changes.primary_fingerprint not in allow_source_only_new_keys \
|
|
| 835 |
+ and changes.source_name not in allow_source_only_new_sources:
|
|
| 833 | 836 |
raise Reject('Source-only uploads to NEW are not allowed.')
|
| 834 | 837 |
|
| 835 | 838 |
if 'all' not in changes.architectures and changes.source.package_list.has_arch_indep_packages():
|