From f1b68417570b79ae872056c2b5337ea570c3c89a Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Thu, 10 Mar 2016 14:40:10 +0100 Subject: [PATCH 1/2] add Checksums-Sha512 to isMultilineField Otherwise line breaks are not properly handled and the output contains excess newlines Fixes #361 --- deb/format.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/deb/format.go b/deb/format.go index 5348c930..5efd4352 100644 --- a/deb/format.go +++ b/deb/format.go @@ -106,6 +106,8 @@ func isMultilineField(field string, isRelease bool) bool { return true case "Checksums-Sha256": return true + case "Checksums-Sha512": + return true case "Package-List": return true case "MD5Sum": From cfaa8f3881f76bda1f273fc8d7953d2fea3ed176 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 10 Mar 2016 17:22:40 +0300 Subject: [PATCH 2/2] Fix system tests. --- system/t06_publish/PublishRepo1Test_sources | 8 ++++---- system/t06_publish/PublishSnapshot17Test_sources | 8 ++++---- system/t06_publish/PublishUpdate2Test_sources | 8 ++++---- system/t06_publish/PublishUpdate7Test_sources | 8 ++++---- system/t06_publish/S3Publish1Test_sources | 11 +++++------ system/t06_publish/SwiftPublish1Test_sources | 11 +++++------ 6 files changed, 26 insertions(+), 28 deletions(-) diff --git a/system/t06_publish/PublishRepo1Test_sources b/system/t06_publish/PublishRepo1Test_sources index 47b940d6..2f3fe15d 100644 --- a/system/t06_publish/PublishRepo1Test_sources +++ b/system/t06_publish/PublishRepo1Test_sources @@ -1,10 +1,9 @@ - - 22ff26db69b73d3438fdde21ab5ba2f1 3456 pyspi_0.6.1-1.3.diff.gz 22ff26db69b73d3438fdde21ab5ba2f1 3456 pyspi_0.6.1-1.3.diff.gz + 262cac59a2e81c7f110851ff9670c97ffc3d192d9937b880422a0907f26340d43e7de7e68b904a4fb10bedb02b65c3bd1f7bdd20ea8c4293e690e7a8e0e70ee5 893 pyspi-0.6.1-1.3.stripped.dsc 289d3aefa970876e9c43686ce2b02f478d7f3ed35a713928464a98d54ae4fca3 893 pyspi-0.6.1-1.3.stripped.dsc 2e770b28df948f3197ed0b679bdea99f3f2bf745e9ddb440c677df9c3aeaee3c 3456 pyspi_0.6.1-1.3.diff.gz 2e770b28df948f3197ed0b679bdea99f3f2bf745e9ddb440c677df9c3aeaee3c 3456 pyspi_0.6.1-1.3.diff.gz @@ -21,6 +20,7 @@ d494aaf526f1ec6b02f14c2f81e060a5722d6532ddc760ec16972e45c2625989 1782 pyspi_0.6.1-1.3.dsc def336bd566ea688a06ec03db7ccf1f4 29063 pyspi_0.6.1.orig.tar.gz def336bd566ea688a06ec03db7ccf1f4 29063 pyspi_0.6.1.orig.tar.gz + fde06b7dc5762a04986d0669420822f6a1e82b195322ae9cbd2dae40bda557c57ad77fe3546007ea645f801c4cd30ef4eb0e96efb2dee6b71c4c9a187d643683 1782 pyspi_0.6.1-1.3.dsc Architecture: any Architecture: any Binary: python-at-spi @@ -31,8 +31,8 @@ Checksums-Sha1: Checksums-Sha1: Checksums-Sha256: Checksums-Sha256: -Checksums-Sha512: 262cac59a2e81c7f110851ff9670c97ffc3d192d9937b880422a0907f26340d43e7de7e68b904a4fb10bedb02b65c3bd1f7bdd20ea8c4293e690e7a8e0e70ee5 893 pyspi-0.6.1-1.3.stripped.dsc -Checksums-Sha512: fde06b7dc5762a04986d0669420822f6a1e82b195322ae9cbd2dae40bda557c57ad77fe3546007ea645f801c4cd30ef4eb0e96efb2dee6b71c4c9a187d643683 1782 pyspi_0.6.1-1.3.dsc +Checksums-Sha512: +Checksums-Sha512: Directory: pool/main/p/pyspi Directory: pool/main/p/pyspi Files: diff --git a/system/t06_publish/PublishSnapshot17Test_sources b/system/t06_publish/PublishSnapshot17Test_sources index 47b940d6..2f3fe15d 100644 --- a/system/t06_publish/PublishSnapshot17Test_sources +++ b/system/t06_publish/PublishSnapshot17Test_sources @@ -1,10 +1,9 @@ - - 22ff26db69b73d3438fdde21ab5ba2f1 3456 pyspi_0.6.1-1.3.diff.gz 22ff26db69b73d3438fdde21ab5ba2f1 3456 pyspi_0.6.1-1.3.diff.gz + 262cac59a2e81c7f110851ff9670c97ffc3d192d9937b880422a0907f26340d43e7de7e68b904a4fb10bedb02b65c3bd1f7bdd20ea8c4293e690e7a8e0e70ee5 893 pyspi-0.6.1-1.3.stripped.dsc 289d3aefa970876e9c43686ce2b02f478d7f3ed35a713928464a98d54ae4fca3 893 pyspi-0.6.1-1.3.stripped.dsc 2e770b28df948f3197ed0b679bdea99f3f2bf745e9ddb440c677df9c3aeaee3c 3456 pyspi_0.6.1-1.3.diff.gz 2e770b28df948f3197ed0b679bdea99f3f2bf745e9ddb440c677df9c3aeaee3c 3456 pyspi_0.6.1-1.3.diff.gz @@ -21,6 +20,7 @@ d494aaf526f1ec6b02f14c2f81e060a5722d6532ddc760ec16972e45c2625989 1782 pyspi_0.6.1-1.3.dsc def336bd566ea688a06ec03db7ccf1f4 29063 pyspi_0.6.1.orig.tar.gz def336bd566ea688a06ec03db7ccf1f4 29063 pyspi_0.6.1.orig.tar.gz + fde06b7dc5762a04986d0669420822f6a1e82b195322ae9cbd2dae40bda557c57ad77fe3546007ea645f801c4cd30ef4eb0e96efb2dee6b71c4c9a187d643683 1782 pyspi_0.6.1-1.3.dsc Architecture: any Architecture: any Binary: python-at-spi @@ -31,8 +31,8 @@ Checksums-Sha1: Checksums-Sha1: Checksums-Sha256: Checksums-Sha256: -Checksums-Sha512: 262cac59a2e81c7f110851ff9670c97ffc3d192d9937b880422a0907f26340d43e7de7e68b904a4fb10bedb02b65c3bd1f7bdd20ea8c4293e690e7a8e0e70ee5 893 pyspi-0.6.1-1.3.stripped.dsc -Checksums-Sha512: fde06b7dc5762a04986d0669420822f6a1e82b195322ae9cbd2dae40bda557c57ad77fe3546007ea645f801c4cd30ef4eb0e96efb2dee6b71c4c9a187d643683 1782 pyspi_0.6.1-1.3.dsc +Checksums-Sha512: +Checksums-Sha512: Directory: pool/main/p/pyspi Directory: pool/main/p/pyspi Files: diff --git a/system/t06_publish/PublishUpdate2Test_sources b/system/t06_publish/PublishUpdate2Test_sources index 47b940d6..2f3fe15d 100644 --- a/system/t06_publish/PublishUpdate2Test_sources +++ b/system/t06_publish/PublishUpdate2Test_sources @@ -1,10 +1,9 @@ - - 22ff26db69b73d3438fdde21ab5ba2f1 3456 pyspi_0.6.1-1.3.diff.gz 22ff26db69b73d3438fdde21ab5ba2f1 3456 pyspi_0.6.1-1.3.diff.gz + 262cac59a2e81c7f110851ff9670c97ffc3d192d9937b880422a0907f26340d43e7de7e68b904a4fb10bedb02b65c3bd1f7bdd20ea8c4293e690e7a8e0e70ee5 893 pyspi-0.6.1-1.3.stripped.dsc 289d3aefa970876e9c43686ce2b02f478d7f3ed35a713928464a98d54ae4fca3 893 pyspi-0.6.1-1.3.stripped.dsc 2e770b28df948f3197ed0b679bdea99f3f2bf745e9ddb440c677df9c3aeaee3c 3456 pyspi_0.6.1-1.3.diff.gz 2e770b28df948f3197ed0b679bdea99f3f2bf745e9ddb440c677df9c3aeaee3c 3456 pyspi_0.6.1-1.3.diff.gz @@ -21,6 +20,7 @@ d494aaf526f1ec6b02f14c2f81e060a5722d6532ddc760ec16972e45c2625989 1782 pyspi_0.6.1-1.3.dsc def336bd566ea688a06ec03db7ccf1f4 29063 pyspi_0.6.1.orig.tar.gz def336bd566ea688a06ec03db7ccf1f4 29063 pyspi_0.6.1.orig.tar.gz + fde06b7dc5762a04986d0669420822f6a1e82b195322ae9cbd2dae40bda557c57ad77fe3546007ea645f801c4cd30ef4eb0e96efb2dee6b71c4c9a187d643683 1782 pyspi_0.6.1-1.3.dsc Architecture: any Architecture: any Binary: python-at-spi @@ -31,8 +31,8 @@ Checksums-Sha1: Checksums-Sha1: Checksums-Sha256: Checksums-Sha256: -Checksums-Sha512: 262cac59a2e81c7f110851ff9670c97ffc3d192d9937b880422a0907f26340d43e7de7e68b904a4fb10bedb02b65c3bd1f7bdd20ea8c4293e690e7a8e0e70ee5 893 pyspi-0.6.1-1.3.stripped.dsc -Checksums-Sha512: fde06b7dc5762a04986d0669420822f6a1e82b195322ae9cbd2dae40bda557c57ad77fe3546007ea645f801c4cd30ef4eb0e96efb2dee6b71c4c9a187d643683 1782 pyspi_0.6.1-1.3.dsc +Checksums-Sha512: +Checksums-Sha512: Directory: pool/main/p/pyspi Directory: pool/main/p/pyspi Files: diff --git a/system/t06_publish/PublishUpdate7Test_sources b/system/t06_publish/PublishUpdate7Test_sources index 47b940d6..2f3fe15d 100644 --- a/system/t06_publish/PublishUpdate7Test_sources +++ b/system/t06_publish/PublishUpdate7Test_sources @@ -1,10 +1,9 @@ - - 22ff26db69b73d3438fdde21ab5ba2f1 3456 pyspi_0.6.1-1.3.diff.gz 22ff26db69b73d3438fdde21ab5ba2f1 3456 pyspi_0.6.1-1.3.diff.gz + 262cac59a2e81c7f110851ff9670c97ffc3d192d9937b880422a0907f26340d43e7de7e68b904a4fb10bedb02b65c3bd1f7bdd20ea8c4293e690e7a8e0e70ee5 893 pyspi-0.6.1-1.3.stripped.dsc 289d3aefa970876e9c43686ce2b02f478d7f3ed35a713928464a98d54ae4fca3 893 pyspi-0.6.1-1.3.stripped.dsc 2e770b28df948f3197ed0b679bdea99f3f2bf745e9ddb440c677df9c3aeaee3c 3456 pyspi_0.6.1-1.3.diff.gz 2e770b28df948f3197ed0b679bdea99f3f2bf745e9ddb440c677df9c3aeaee3c 3456 pyspi_0.6.1-1.3.diff.gz @@ -21,6 +20,7 @@ d494aaf526f1ec6b02f14c2f81e060a5722d6532ddc760ec16972e45c2625989 1782 pyspi_0.6.1-1.3.dsc def336bd566ea688a06ec03db7ccf1f4 29063 pyspi_0.6.1.orig.tar.gz def336bd566ea688a06ec03db7ccf1f4 29063 pyspi_0.6.1.orig.tar.gz + fde06b7dc5762a04986d0669420822f6a1e82b195322ae9cbd2dae40bda557c57ad77fe3546007ea645f801c4cd30ef4eb0e96efb2dee6b71c4c9a187d643683 1782 pyspi_0.6.1-1.3.dsc Architecture: any Architecture: any Binary: python-at-spi @@ -31,8 +31,8 @@ Checksums-Sha1: Checksums-Sha1: Checksums-Sha256: Checksums-Sha256: -Checksums-Sha512: 262cac59a2e81c7f110851ff9670c97ffc3d192d9937b880422a0907f26340d43e7de7e68b904a4fb10bedb02b65c3bd1f7bdd20ea8c4293e690e7a8e0e70ee5 893 pyspi-0.6.1-1.3.stripped.dsc -Checksums-Sha512: fde06b7dc5762a04986d0669420822f6a1e82b195322ae9cbd2dae40bda557c57ad77fe3546007ea645f801c4cd30ef4eb0e96efb2dee6b71c4c9a187d643683 1782 pyspi_0.6.1-1.3.dsc +Checksums-Sha512: +Checksums-Sha512: Directory: pool/main/p/pyspi Directory: pool/main/p/pyspi Files: diff --git a/system/t06_publish/S3Publish1Test_sources b/system/t06_publish/S3Publish1Test_sources index 47b940d6..84a714cc 100644 --- a/system/t06_publish/S3Publish1Test_sources +++ b/system/t06_publish/S3Publish1Test_sources @@ -1,10 +1,8 @@ - - - 22ff26db69b73d3438fdde21ab5ba2f1 3456 pyspi_0.6.1-1.3.diff.gz 22ff26db69b73d3438fdde21ab5ba2f1 3456 pyspi_0.6.1-1.3.diff.gz + 262cac59a2e81c7f110851ff9670c97ffc3d192d9937b880422a0907f26340d43e7de7e68b904a4fb10bedb02b65c3bd1f7bdd20ea8c4293e690e7a8e0e70ee5 893 pyspi-0.6.1-1.3.stripped.dsc 289d3aefa970876e9c43686ce2b02f478d7f3ed35a713928464a98d54ae4fca3 893 pyspi-0.6.1-1.3.stripped.dsc 2e770b28df948f3197ed0b679bdea99f3f2bf745e9ddb440c677df9c3aeaee3c 3456 pyspi_0.6.1-1.3.diff.gz 2e770b28df948f3197ed0b679bdea99f3f2bf745e9ddb440c677df9c3aeaee3c 3456 pyspi_0.6.1-1.3.diff.gz @@ -21,6 +19,7 @@ d494aaf526f1ec6b02f14c2f81e060a5722d6532ddc760ec16972e45c2625989 1782 pyspi_0.6.1-1.3.dsc def336bd566ea688a06ec03db7ccf1f4 29063 pyspi_0.6.1.orig.tar.gz def336bd566ea688a06ec03db7ccf1f4 29063 pyspi_0.6.1.orig.tar.gz + fde06b7dc5762a04986d0669420822f6a1e82b195322ae9cbd2dae40bda557c57ad77fe3546007ea645f801c4cd30ef4eb0e96efb2dee6b71c4c9a187d643683 1782 pyspi_0.6.1-1.3.dsc Architecture: any Architecture: any Binary: python-at-spi @@ -31,8 +30,8 @@ Checksums-Sha1: Checksums-Sha1: Checksums-Sha256: Checksums-Sha256: -Checksums-Sha512: 262cac59a2e81c7f110851ff9670c97ffc3d192d9937b880422a0907f26340d43e7de7e68b904a4fb10bedb02b65c3bd1f7bdd20ea8c4293e690e7a8e0e70ee5 893 pyspi-0.6.1-1.3.stripped.dsc -Checksums-Sha512: fde06b7dc5762a04986d0669420822f6a1e82b195322ae9cbd2dae40bda557c57ad77fe3546007ea645f801c4cd30ef4eb0e96efb2dee6b71c4c9a187d643683 1782 pyspi_0.6.1-1.3.dsc +Checksums-Sha512: +Checksums-Sha512: Directory: pool/main/p/pyspi Directory: pool/main/p/pyspi Files: @@ -50,4 +49,4 @@ Standards-Version: 3.7.3 Vcs-Svn: svn://svn.tribulaciones.org/srv/svn/pyspi/trunk Vcs-Svn: svn://svn.tribulaciones.org/srv/svn/pyspi/trunk Version: 0.6.1-1.3 -Version: 0.6.1-1.4 \ No newline at end of file +Version: 0.6.1-1.4 diff --git a/system/t06_publish/SwiftPublish1Test_sources b/system/t06_publish/SwiftPublish1Test_sources index 47b940d6..84a714cc 100644 --- a/system/t06_publish/SwiftPublish1Test_sources +++ b/system/t06_publish/SwiftPublish1Test_sources @@ -1,10 +1,8 @@ - - - 22ff26db69b73d3438fdde21ab5ba2f1 3456 pyspi_0.6.1-1.3.diff.gz 22ff26db69b73d3438fdde21ab5ba2f1 3456 pyspi_0.6.1-1.3.diff.gz + 262cac59a2e81c7f110851ff9670c97ffc3d192d9937b880422a0907f26340d43e7de7e68b904a4fb10bedb02b65c3bd1f7bdd20ea8c4293e690e7a8e0e70ee5 893 pyspi-0.6.1-1.3.stripped.dsc 289d3aefa970876e9c43686ce2b02f478d7f3ed35a713928464a98d54ae4fca3 893 pyspi-0.6.1-1.3.stripped.dsc 2e770b28df948f3197ed0b679bdea99f3f2bf745e9ddb440c677df9c3aeaee3c 3456 pyspi_0.6.1-1.3.diff.gz 2e770b28df948f3197ed0b679bdea99f3f2bf745e9ddb440c677df9c3aeaee3c 3456 pyspi_0.6.1-1.3.diff.gz @@ -21,6 +19,7 @@ d494aaf526f1ec6b02f14c2f81e060a5722d6532ddc760ec16972e45c2625989 1782 pyspi_0.6.1-1.3.dsc def336bd566ea688a06ec03db7ccf1f4 29063 pyspi_0.6.1.orig.tar.gz def336bd566ea688a06ec03db7ccf1f4 29063 pyspi_0.6.1.orig.tar.gz + fde06b7dc5762a04986d0669420822f6a1e82b195322ae9cbd2dae40bda557c57ad77fe3546007ea645f801c4cd30ef4eb0e96efb2dee6b71c4c9a187d643683 1782 pyspi_0.6.1-1.3.dsc Architecture: any Architecture: any Binary: python-at-spi @@ -31,8 +30,8 @@ Checksums-Sha1: Checksums-Sha1: Checksums-Sha256: Checksums-Sha256: -Checksums-Sha512: 262cac59a2e81c7f110851ff9670c97ffc3d192d9937b880422a0907f26340d43e7de7e68b904a4fb10bedb02b65c3bd1f7bdd20ea8c4293e690e7a8e0e70ee5 893 pyspi-0.6.1-1.3.stripped.dsc -Checksums-Sha512: fde06b7dc5762a04986d0669420822f6a1e82b195322ae9cbd2dae40bda557c57ad77fe3546007ea645f801c4cd30ef4eb0e96efb2dee6b71c4c9a187d643683 1782 pyspi_0.6.1-1.3.dsc +Checksums-Sha512: +Checksums-Sha512: Directory: pool/main/p/pyspi Directory: pool/main/p/pyspi Files: @@ -50,4 +49,4 @@ Standards-Version: 3.7.3 Vcs-Svn: svn://svn.tribulaciones.org/srv/svn/pyspi/trunk Vcs-Svn: svn://svn.tribulaciones.org/srv/svn/pyspi/trunk Version: 0.6.1-1.3 -Version: 0.6.1-1.4 \ No newline at end of file +Version: 0.6.1-1.4