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

[SCM] Debian package checker branch, master, updated. 2.5.1-143-gcfd1097



The following commit has been merged in the master branch:
commit cfd10972bed44a10012c18ce2bef1102b64937e7
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Jul 25 20:36:30 2011 +0200

    Added changelog entry for some of the previous commits
    
    Also removed unused sub.

diff --git a/debian/changelog b/debian/changelog
index 2493585..221f7c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -189,6 +189,8 @@ lintian (2.5.2) UNRELEASED; urgency=low
   * lib/Lab.pm:
     + [NT] Removed $dist argument to lab creation, since we rely on
       LINTIAN_DIST being exported anyway.
+    + [NT] Allow temporary labs to contain the same package twice if
+      the version or/and architecture differs.  (Closes: #632115)
   * lib/Lab/Package.pm:
     + [NT] Symlink in all components of the source package when
       creating the source entry in the lab.  Also removed legacy
@@ -205,6 +207,12 @@ lintian (2.5.2) UNRELEASED; urgency=low
       err_append options.
   * lib/Lintian/{Internal/FrontendUtil,Profile}.pm:
     + [NT] New files.
+  * lib/Lintian/ProcessablePool.pm:
+    + [NT] Made the pool consider two packages with the same name
+      as duplicates even if their version or architecture differs,
+      when the underlying Lab does not support this run.  This
+      causes lintian to drop one of the packages rather than ending
+      up with an internal error.
   * lib/Lintian/{Tag/Info,Tags}.pm:
     + [NT] Updated for profile support.
   * lib/Read_pkglists.pm:
diff --git a/lib/Lintian/ProcessablePool.pm b/lib/Lintian/ProcessablePool.pm
index 8cfa4a2..2a7271f 100644
--- a/lib/Lintian/ProcessablePool.pm
+++ b/lib/Lintian/ProcessablePool.pm
@@ -185,11 +185,6 @@ sub _init {
     return 1;
 }
 
-sub _supports {
-    my ($self, $feat) = @_;
-    return $self->{"supports-$feat"};
-}
-
 sub _add_changes_file{
     my ($self, $pkg_path) = @_;
     my $group = Lintian::ProcessableGroup->new($pkg_path);

-- 
Debian package checker


Reply to: