Author: djpig
Date: 2005-08-13 01:44:18 +0200 (Sat, 13 Aug 2005)
New Revision: 472

Modified:
   trunk/checks/fields
   trunk/checks/fields.desc
   trunk/debian/changelog
   trunk/testset/relations/debian/control
   trunk/testset/tags.relations
Log:
Also use non_standards_archs when checking source package
relations. Patch by Russ Allbery (Closes: #322291)


Modified: trunk/checks/fields
===================================================================
--- trunk/checks/fields 2005-08-12 23:23:18 UTC (rev 471)
+++ trunk/checks/fields 2005-08-12 23:44:18 UTC (rev 472)
@@ -448,8 +448,11 @@
                                        my ($d_pkg, $d_version, $d_arch, $rest, 
$part_d_orig) = @$part_d;
 
                                        for my $arch (@{$d_arch->[0]}) {
-                                               tag 
"invalid-arch-string-in-source-relation", "$arch [$field: $part_d_orig]"
-                                                   unless ($known_archs{$arch} 
|| $arch eq "any" || $arch eq "all");
+                                               if ($non_standard_archs{$arch}) 
{
+                                                       tag 
"non-standard-arch-in-source-relation", "$arch [$field: $part_d_orig]";
+                                               } elsif (!$known_archs{$arch} 
&& $arch ne "any" && $arch ne "all") {
+                                                       tag 
"invalid-arch-string-in-source-relation", "$arch [$field: $part_d_orig]"
+                                               }
                                        }
 
                                        tag 
"depends-on-build-essential-package-without-using-version", "$d_pkg [$field: 
$part_d_orig]"

Modified: trunk/checks/fields.desc
===================================================================
--- trunk/checks/fields.desc    2005-08-12 23:23:18 UTC (rev 471)
+++ trunk/checks/fields.desc    2005-08-12 23:44:18 UTC (rev 472)
@@ -384,6 +384,11 @@
  A common cause of this is a comma in the arch, i.e. [i386, m68k], it should
  be [i386 m68k].
 
+Tag: non-standard-arch-in-source-relation
+Type: info
+Info: The architecture string in the source relation is one of the
+ architectures still waiting to be included in the archive.
+
 Tag: depends-on-build-essential-package-without-using-version
 Type: error
 Info: The package declares a depends on a build essential package without

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2005-08-12 23:23:18 UTC (rev 471)
+++ trunk/debian/changelog      2005-08-12 23:44:18 UTC (rev 472)
@@ -21,10 +21,12 @@
     + [FL] Avoid double warning about description-is-dh_make-template
       in the same way we do it for the corresponding debmake tag
     + [FL] Policy section of Description field has changed
-  * checks/fields.desc:
+  * checks/fields{,.desc}:
     + [FL] Fix a lot of off-by-one errors in the policy references
       (caused by the addition of the Uploaders field). Unknowningly
       pointed out by Russ Allbery
+    + [FL] Also use non_standards_archs when checking source package
+      relations. Patch by Russ Allbery (Closes: #322291)
   * checks/manpages:
     + [FL] Don't issue warnings about 8bit characters in translated
       man pages. Patch by Denis Barbier (Closes: #321650)

Modified: trunk/testset/relations/debian/control
===================================================================
--- trunk/testset/relations/debian/control      2005-08-12 23:23:18 UTC (rev 
471)
+++ trunk/testset/relations/debian/control      2005-08-12 23:44:18 UTC (rev 
472)
@@ -3,6 +3,7 @@
 Priority: optional
 Build-Depends: mail-transport-agent, libc6-dev, findutils, foo (>> 2) bar baz 
bat
 Build-Depends-Indep: make, bash
+Build-Conflicts: foo [amd64 i386], bar [alpha test] 
 Maintainer: Debian QA Group <[EMAIL PROTECTED]>
 Standards-Version: 3.1.1
 Origin: Debian

Modified: trunk/testset/tags.relations
===================================================================
--- trunk/testset/tags.relations        2005-08-12 23:23:18 UTC (rev 471)
+++ trunk/testset/tags.relations        2005-08-12 23:44:18 UTC (rev 472)
@@ -1,9 +1,10 @@
 E: relations source: bad-relation build-depends: foo (>> 2) bar baz bat
 E: relations source: build-depends-on-essential-package-without-using-version 
build-depends-indep: bash
 E: relations source: build-depends-on-essential-package-without-using-version 
build-depends: findutils
-E: relations source: debian-control-with-duplicate-fields provides: 30, 31
+E: relations source: debian-control-with-duplicate-fields provides: 31, 32
 E: relations source: depends-on-build-essential-package-without-using-version 
libc6-dev [build-depends: libc6-dev]
 E: relations source: depends-on-build-essential-package-without-using-version 
make [build-depends-indep: make]
+E: relations source: invalid-arch-string-in-source-relation test 
[build-conflicts: bar [alpha test]]
 E: relations-multiple-libs: description-synopsis-is-duplicated
 E: relations-multiple-libs: package-depends-on-multiple-libpng-versions 
libpng2 libpng3
 E: relations-multiple-libs: package-depends-on-multiple-libstdc-versions 
libstdc++2.10 libstdc++2.10-glibc2.2 libstdc++3.0
@@ -16,6 +17,7 @@
 E: relations: needlessly-depends-on-awk depends
 E: relations: no-copyright-file
 E: relations: obsolete-field optional
+I: relations source: non-standard-arch-in-source-relation amd64 
[build-conflicts: foo [amd64 i386]]
 I: relations-multiple-libs: unknown-field-in-control bugs
 I: relations-multiple-libs: unknown-field-in-control origin
 I: relations: unknown-field-in-control bugs


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to