Recognise and ignore Breaks: lines. Closes: #523444
This commit is contained in:
parent
b99932aa56
commit
afd7a7a557
|
@ -22,6 +22,7 @@ debian-cd (3.1.2) UNRELEASED; urgency=low
|
|||
[ Steve McIntyre ]
|
||||
* tools/imagesums: Add support for more checksum types. genisoimage
|
||||
will shortly start generating sha256 and sha512 sums too.
|
||||
* Recognise and ignore Breaks: lines. Closes: #523444
|
||||
|
||||
-- Frans Pop <fjp@debian.org> Sun, 15 Feb 2009 23:41:25 +0100
|
||||
|
||||
|
|
|
@ -308,14 +308,16 @@ 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";
|
||||
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")) {
|
||||
$$i++;
|
||||
while ($lines->[$$i] =~ m/^\s{4}/) {
|
||||
$$i++;
|
||||
|
|
Loading…
Reference in New Issue