Pārlūkot izejas kodu

Dpkg::Deps: refuse to parse ORed deps only when union deps are requested

This was the intended behaviour when that change was made
in f65e9c9a2e521e32b0de6a963ab1e58790001366.
Raphael Hertzog 17 gadi atpakaļ
vecāks
revīzija
5badd6d716
1 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. 2 2
      scripts/Dpkg/Deps.pm

+ 2 - 2
scripts/Dpkg/Deps.pm

@@ -1,4 +1,4 @@
-# Copyright © 2007 Raphael Hertzog <hertzog@debian.org>
+# Copyright © 2007-2009 Raphael Hertzog <hertzog@debian.org>
 #
 #
 # This program is free software; you may redistribute it and/or modify
 # This program is free software; you may redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # it under the terms of the GNU General Public License as published by
@@ -336,7 +336,7 @@ sub parse {
 	$dep_and = Dpkg::Deps::AND->new();
 	$dep_and = Dpkg::Deps::AND->new();
     }
     }
     foreach my $dep (@dep_list) {
     foreach my $dep (@dep_list) {
-        if (not $dep->isa("Dpkg::Deps::Simple")) {
+        if ($options{union} and not $dep->isa("Dpkg::Deps::Simple")) {
             warning(_g("an union dependency can only contain simple dependencies"));
             warning(_g("an union dependency can only contain simple dependencies"));
             return undef;
             return undef;
         }
         }