Bug#923427: mergechanges: Regression: --indep/source breaks multi-line Binary fields

2019-02-28 Thread Simon McVittie
On Thu, 28 Feb 2019 at 21:28:47 +0100, Mattia Rizzolo wrote:
> There shouldn't be debs in Files but not in Binaries.   Which packages are
> missing there?

The test that I added using Salvatore's .changes file says the -dbgsym
packages aren't listed in Binary:

Warning: hyperv-daemons-dbgsym not found in Binary field
52a99bb89b091d9f88008b9b78bb 41354 debug extra 
hyperv-daemons-dbgsym_4.9.161-1_amd64.deb
Warning: libcpupower1-dbgsym not found in Binary field
dcf307126f4a0eebe135f8f20aea9d94 20096 debug extra 
libcpupower1-dbgsym_4.9.161-1_amd64.deb
Warning: linux-cpupower-dbgsym not found in Binary field
28344bc7bcfa99bb67112ad8eab7d7b5 54550 debug extra 
linux-cpupower-dbgsym_4.9.161-1_amd64.deb
Warning: linux-kbuild-4.9-dbgsym not found in Binary field
ad6e009533db6131f7861b5eb881254e 488164 debug extra 
linux-kbuild-4.9-dbgsym_4.9.161-1_amd64.deb
Warning: linux-perf-4.9-dbgsym not found in Binary field
93c6711fb982bad7df8a62ab1292ea87 4484002 debug extra 
linux-perf-4.9-dbgsym_4.9.161-1_amd64.deb
Warning: usbip-dbgsym not found in Binary field
1b59f042a4a6780b0e76319950737bfe 92978 debug extra 
usbip-dbgsym_2.0+4.9.161-1_amd64.deb

(repeated twice; the lines ending with .deb are quoting from Files)

This seems like it might be a quirk of stretch's toolchain: if you look at
https://buildd.debian.org/status/fetch.php?pkg=dpkg=amd64=1.18.25=1530308035=0
you'll see that dpkg-dbgsym and dselect-dbgsym aren't in Binary or
Description either, whereas in
https://buildd.debian.org/status/fetch.php?pkg=dpkg=amd64=1.19.5=1550947218=0
they are in Binary but not Description.

smcv



Processed: Re: Bug#923427: mergechanges: Regression: --indep/source breaks multi-line Binary fields

2019-02-28 Thread Debian Bug Tracking System
Processing control commands:

> retitle -1 mergechanges: Regression: --indep/source breaks multi-line Binary 
> fields
Bug #923427 [devscripts] mergechanges: Regression: --indep/source 
mangles/breaks (valid?) Binary fields
Changed Bug title to 'mergechanges: Regression: --indep/source breaks 
multi-line Binary fields' from 'mergechanges: Regression: --indep/source 
mangles/breaks (valid?) Binary fields'.
> forwarded -1 https://salsa.debian.org/debian/devscripts/merge_requests/112
Bug #923427 [devscripts] mergechanges: Regression: --indep/source breaks 
multi-line Binary fields
Set Bug forwarded-to-address to 
'https://salsa.debian.org/debian/devscripts/merge_requests/112'.
> tags -1 + patch
Bug #923427 [devscripts] mergechanges: Regression: --indep/source breaks 
multi-line Binary fields
Added tag(s) patch.

-- 
923427: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923427
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems



Bug#923427: mergechanges: Regression: --indep/source breaks multi-line Binary fields

2019-02-28 Thread Simon McVittie
Control: retitle -1 mergechanges: Regression: --indep/source breaks multi-line 
Binary fields
Control: forwarded -1 
https://salsa.debian.org/debian/devscripts/merge_requests/112
Control: tags -1 + patch

On Thu, 28 Feb 2019 at 17:59:25 +, Simon McVittie wrote:
> I'll try to put together some sort of parsing fix in shell for buster

Try this:
https://salsa.debian.org/debian/devscripts/merge_requests/112

I've added Salvatore's changes file unmodified as a test-case, since it
has a couple of interesting corner cases for the parser.

To make mergechanges accept that changes file, I also had to make it more
tolerant of packages that are in Files but not Binary, which apparently
happens in stretch kernels? (Again, I didn't know this was even possible.)

Regards,
smcv