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

[SCM] Debian package checker branch, master, updated. 2.5.14-34-gdea0d88



The following commit has been merged in the master branch:
commit dea0d8861b4aad72a9b77e487e929c579f6de8af
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Jul 2 16:08:53 2013 +0200

    L::ProcessablePool: Add .changes when merging groups
    
    When merging a group (from a .changes file) into an existing group,
    also add the new .changes file if possible.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/debian/changelog b/debian/changelog
index 10e244d..3a1a2fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,13 @@ lintian (2.5.15) UNRELEASED; urgency=low
     + [NT] "binaries" and "binary_field" now only exposes data
       about entries in d/control with a valid package name.
     + [NT] Document that "binaries" return an unorderd list.
+  * lib/Lintian/ProcessablePool.pm:
+    + [NT] Fix a bug that could cause .changes files to be
+      silently skipped.  This only occured if a related package
+      was passed on the command line before the .changes file.
+      Thanks to Salvo Tomaselli for reporting the bug.
+      (Closes: #714437)
+
 
  -- Niels Thykier <niels@thykier.net>  Sat, 29 Jun 2013 21:11:09 +0200
 
diff --git a/lib/Lintian/ProcessablePool.pm b/lib/Lintian/ProcessablePool.pm
index 01300bd..ac6e88f 100644
--- a/lib/Lintian/ProcessablePool.pm
+++ b/lib/Lintian/ProcessablePool.pm
@@ -195,6 +195,11 @@ sub _add_changes_file{
         # Merge architectures/packages ...
         # Accept all new
 
+        if (!defined($ogroup->get_changes_processable)) {
+            $ogroup->add_processable($cproc);
+            $added = 1;
+        }
+
         if (! defined $ogroup->get_source_processable()
             && defined $group->get_source_processable()){
                 $ogroup->add_processable($group->get_source_processable());

-- 
Debian package checker


Reply to: