Просмотр исходного кода

dpkg-source/dpkg-genchanges: split long Binary: field values

Raphael Hertzog лет назад: 17
Родитель
Сommit
00b1d9dce7
3 измененных файлов с 6 добавлено и 0 удалено
  1. 2 0
      debian/changelog
  2. 2 0
      scripts/dpkg-genchanges.pl
  3. 2 0
      scripts/dpkg-source.pl

+ 2 - 0
debian/changelog

@@ -72,6 +72,8 @@ dpkg (1.15.4) UNRELEASED; urgency=low
       cputable (and so that a versioned build-dependency on dpkg-dev is enough
       to use this new feature)
     Closes: #531307
+  * Split overly long Binary: field values over multiple lines. This is
+    allowed since policy 3.8.3. Closes: #494714
 
   [ Modestas Vainius ]
   * Provide a meaningful label for dpkg-gensymbols diff.

+ 2 - 0
scripts/dpkg-genchanges.pl

@@ -484,6 +484,8 @@ if (!defined($fields->{'Date'})) {
 }
 
 $fields->{'Binary'} = join(' ', map { $_->{'Package'} } $control->get_packages());
+# Avoid overly long line (>~1000 chars) by splitting over multiple lines
+$fields->{'Binary'} =~ s/(.{980,}?) /$1\n /g;
 
 unshift(@archvalues,'source') unless is_binaryonly;
 @archvalues = ('all') if $include == ARCH_INDEP;

+ 2 - 0
scripts/dpkg-source.pl

@@ -245,6 +245,8 @@ if ($options{'opmode'} eq 'build') {
     }
     
     $fields->{'Binary'} = join(', ', @binarypackages);
+    # Avoid overly long line (>~1000 chars) by splitting over multiple lines
+    $fields->{'Binary'} =~ s/(.{980,}?), ?/$1,\n /g;
 
     # Generate list of formats to try
     my @try_formats = (@cmdline_formats);