mirror of
https://salsa.debian.org/images-team/debian-cd.git
synced 2024-11-24 15:19:51 -01:00
Backport r1911 and r1935: recognise and ignore Breaks: and Enhances: lines
This commit is contained in:
parent
81ee003aed
commit
7d2a9a47cc
@ -313,14 +313,17 @@ sub read_depends {
|
||||
my $i = shift; # Ref
|
||||
my $lines = shift; # Ref
|
||||
my $pkg = shift; # string
|
||||
my $types = "(?:Pre)?Depends|Suggests|Recommends|Replaces|Conflicts";
|
||||
my $types = "(?:Pre)?Depends|Suggests|Recommends|Replaces|Conflicts|Breaks|Enhances";
|
||||
my (@dep, @rec, @sug);
|
||||
my ($type, $or, $elt);
|
||||
|
||||
while ($lines->[$$i] =~ m/^\s([\s\|])($types):/) {
|
||||
$type = $2; $or = $1;
|
||||
# Get rid of replaces and conflicts ...
|
||||
if (($type eq "Replaces") or ($type eq "Conflicts")) {
|
||||
if (($type eq "Replaces") or
|
||||
($type eq "Conflicts") or
|
||||
($type eq "Breaks") or
|
||||
($type eq "Enhances")) {
|
||||
$$i++;
|
||||
while ($lines->[$$i] =~ m/^\s{4}/) {
|
||||
$$i++;
|
||||
|
Loading…
Reference in New Issue
Block a user