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

dpkg-gencontrol.pl: Don't try to parse empty fields.

Raphael Hertzog лет назад: 18
Родитель
Сommit
dbad623b0d
3 измененных файлов с 3 добавлено и 1 удалено
  1. 1 0
      ChangeLog
  2. 1 0
      debian/changelog
  3. 1 1
      scripts/dpkg-gencontrol.pl

+ 1 - 0
ChangeLog

@@ -7,6 +7,7 @@
 	problem (when a RPATH contains $ORIGIN and when the value of
 	this variable can't be determined because we don't know what
 	is the root directory of the temporary tree).
+	* scripts/dpkg-gencontrol.pl: Don't try to parse empty fields.
 
 2007-11-19  Guillem Jover  <guillem@debian.org>
 

+ 1 - 0
debian/changelog

@@ -3,6 +3,7 @@ dpkg (1.14.9) UNRELEASED; urgency=low
   [ Raphael Hertzog ]
   * Fix bad behaviour of Dpkg::Path::get_pkg_root_dir() and adjust
     dpkg-shlibdeps accordingly.
+  * Fix dpkg-gencontrol to not try to parse and simplify empty fields.
 
   [ Updated man pages translations ]
     * German (Helge Kreutzmann).

+ 1 - 1
scripts/dpkg-gencontrol.pl

@@ -249,7 +249,7 @@ if (exists $fi{"C$myindex Provides"}) {
 my (@seen_deps);
 foreach my $field (@pkg_dep_fields) {
     my $key = "C$myindex $field";
-    if (exists $fi{$key}) {
+    if (exists $fi{$key} and $fi{$key}) {
 	my $dep;
 	if ($dep_field_type{$field} eq 'normal') {
 	    $dep = Dpkg::Deps::parse(substvars($fi{$key}), use_arch => 1,