[SCM] Debian package checker branch, infra-513663, updated. 2.4.3-307-gf059268

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the infra-513663 branch:
commit f059268a0d9d5a4330ed184ca3cb45b0995441bf
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Feb 22 16:07:27 2011 +0100

    Do not throw away the changes if a source is specified as well

diff --git a/private/processable-prototype.pl b/private/processable-prototype.pl
index 28a0bf8..2ebdfc0 100755
--- a/private/processable-prototype.pl
+++ b/private/processable-prototype.pl
@@ -85,7 +85,7 @@ foreach my $file (@ARGV) {
     $prockey = gen_proc_key($proc);
     $tmap = $type_map{$type};
     if (exists $tmap->{$prockey}){
-        warning ("Skipping " . $prockey . " ($type) - duplicate package");
+        warning ('Skipping ' . $prockey . " ($type) - duplicate package");
     } else {
         $tmap->{$prockey} = $proc;
     }
@@ -95,8 +95,23 @@ foreach my $file (@ARGV) {
 # create a proc-group for each of the remaining source packages.
 foreach my $source (values %{ $type_map{'source'} }) {
     my $group;
+    my $srckey;
     next if defined $source->group();
-    debug(1, 'Creating group for ' . $source->pkg_src());
+    $srckey = gen_src_proc_key($source);
+    $group = $group_map{$srckey};
+    if (defined $group){
+        if (!defined $group->get_source_processable()){
+            # Happens e.g. with dpkg-buildpackage -b
+            # Technically the source is most likely out of date
+            # but just process it together with the rest anyway.
+            $group->add_processable($source);
+        } else {
+            warning ("Skipping  $srckey (source) - duplicate package");
+        }
+        next;
+    }
+    debug(1, 'Creating group for ' . $source->pkg_src() .
+          '(' . $source->pkg_src_version . ')');
     $group = Lintian::ProcessableGroup->new();
     $group->add_processable($source);
     $group_map{gen_src_proc_key($source)} = $group;

-- 
Debian package checker