[SCM] Debian package checker branch, master, updated. 1.24.4-119-g2275056
The following commit has been merged in the master branch:
commit 239e818660f112ba38512b36ceb4f3a37a9b1f65
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Sat Sep 13 17:15:22 2008 +0100
Revert "Ensure that the schedule hash contains arch when processing lab package lists"
This reverts commit 99615b21f0923c6638d2792d4b2b6d355d7b64c3.
diff --git a/debian/changelog b/debian/changelog
index 3566e72..c596881 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -126,9 +126,6 @@ lintian (2.0.0~rc1) experimental; urgency=low
includes the experimental flag info.
* lib/Lintian/Schedule.pm:
+ [FL] Factor out some scheduling code.
- + [ADB] Ensure that the schedule hash contains the package's
- architecture when processing package lists from the laboratory
- (which don't contain an explicit architecture field).
* lib/Lintian/Data.pm:
+ [FL] Extend Lintian::Data to handle key/value pairs. Patch by
Niko Tyni.
diff --git a/lib/Lintian/Schedule.pm b/lib/Lintian/Schedule.pm
index a0d2dc6..3c36363 100644
--- a/lib/Lintian/Schedule.pm
+++ b/lib/Lintian/Schedule.pm
@@ -47,12 +47,6 @@ sub add_file {
} else {
($pkg, $ver, $arch) =
@pkg_info{qw(package version architecture)};
-
- if (!defined $arch) {
- $arch = $file;
- $arch =~ s/\.u?deb$//;
- $arch =~ s/.*_//;
- }
}
my $s = "$type $pkg $ver $arch $file";
--
Debian package checker
Reply to: