[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, vendor-profile, updated. 2.5.1-42-g8f087b6



The following commit has been merged in the vendor-profile branch:
commit 8f087b6ce02f9d4725843e7885945557f6be661a
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Jun 26 20:18:42 2011 +0200

    Made d/main profile extend the auto-reject profile
    
    The auto-rejects apply to all uploads for Debian, so it makes
    sense to apply the non-overridable tags from the auto-reject
    profile.

diff --git a/private/generate-profiles.pl b/private/generate-profiles.pl
index d55724e..4915527 100755
--- a/private/generate-profiles.pl
+++ b/private/generate-profiles.pl
@@ -7,7 +7,9 @@ use strict;
 use warnings;
 
 use constant LINE_LENGTH => 80;
-use constant FIELD_ORDER => ('Enable-Tags-From-Check',
+use constant FIELD_ORDER => (
+                             'Extends',
+                             'Enable-Tags-From-Check',
                              'Disable-Tags-From-Check',
                              'Enable-Tags',
                              'Disable-Tags',
@@ -39,6 +41,7 @@ foreach my $dir (@dirs) {
 }
 
 generate_profile('debian/main', {
+    'Extends' => 'debian/ftp-master-auto-reject',
     'Enable-Tags-From-Check' => \@checks,
     });
 
@@ -61,7 +64,11 @@ sub generate_profile {
     foreach my $f (FIELD_ORDER) {
         my $val = $main->{$f};
         next unless defined $val;
-        format_field($fd, $f, sort @$val);
+        if ($f eq 'Extends') {
+            format_field($fd, $f, $val);
+        } else {
+            format_field($fd, $f, sort @$val);
+        }
     }
     print $fd "\n";
     foreach my $para (@other) {
diff --git a/profiles/debian/main.profile b/profiles/debian/main.profile
index d46c327..c8a9b1f 100644
--- a/profiles/debian/main.profile
+++ b/profiles/debian/main.profile
@@ -1,5 +1,6 @@
 # This profile is auto-generated
 Profile: debian/main
+Extends: debian/ftp-master-auto-reject
 Enable-Tags-From-Check: binaries, changelog-file, changes-file, circular-deps, conffiles,
  control-file, control-files, copyright-file, cruft, deb-format, debconf,
  debhelper, debian-readme, debian-source-dir, description, duplicate-files,

-- 
Debian package checker


Reply to: