Re: BinNMU changelog handling for Multi-Arch: same packages
Hi,
On Tue, 17 Jul 2012, Philipp Kern wrote:
> > I'm happy to prepare a stable update to fix this. Would you accept it?
>
> I presume there are no other RC bugfixes for dpkg/stable pending at the
> moment?
Guillem mentionned an SELinux fix that would be worth including too.
The commit that fixes it is here:
http://anonscm.debian.org/gitweb/?p=dpkg/dpkg.git;a=commitdiff;h=7db83375c952383540631244ace9cfefdfc908a7
This patch applies without changes on squeeze too.
> Could you prepare the diff and post it here?
The suggested diff is attached. It's a 2 line fix.
Cheers,
--
Raphaël Hertzog ◈ Debian Developer
Get the Debian Administrator's Handbook:
→ http://debian-handbook.info/get/
>From d9c6fae5089789ebd756f3971a9f0f3c7bbb34c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Mon, 30 Jul 2012 09:26:21 +0200
Subject: [PATCH] Dpkg::Changelog: Ignore the Binary-Only keyword field
This new changelog header field has been introduced in Debian Wheezy and
while it's safely ignored in Squeeze, it generates annoying warnings.
This patch disables those warnings.
---
scripts/Dpkg/Changelog.pm | 1 +
scripts/Dpkg/Changelog/Entry/Debian.pm | 1 +
2 files changed, 2 insertions(+)
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index 4303618..b71e90e 100644
--- a/scripts/Dpkg/Changelog.pm
+++ b/scripts/Dpkg/Changelog.pm
@@ -536,6 +536,7 @@ sub dpkg {
my %closes;
foreach (keys %$opts) {
if (/^Urgency$/i) { # Already dealt
+ } elsif (/^Binary-Only$/i) { # Ignore field
} elsif (/^Closes$/i) {
$closes{$_} = 1 foreach (split(/\s+/, $opts->{Closes}));
} else {
diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm
index 3ef8da7..fe272dd 100644
--- a/scripts/Dpkg/Changelog/Entry/Debian.pm
+++ b/scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -130,6 +130,7 @@ sub check_header {
if ($k eq 'Urgency') {
push @errors, sprintf(_g("badly formatted urgency value: %s"), $v)
unless ($v =~ m/^([-0-9a-z]+)((\s+.*)?)$/i);
+ } elsif ($k =~ /^Binary-Only$/i) { # Ignore field
} elsif ($k =~ m/^X[BCS]+-/i) {
} else {
push @errors, sprintf(_g("unknown key-value %s"), $k);
--
1.7.10.4
Reply to: