Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Recognise and ignore Breaks: lines. Closes: #523444

This commit is contained in:
Steve McIntyre 2009-05-16 13:48:49 +00:00
parent b99932aa56
commit afd7a7a557
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -22,6 +22,7 @@ debian-cd (3.1.2) UNRELEASED; urgency=low
[ Steve McIntyre ] [ Steve McIntyre ]
* tools/imagesums: Add support for more checksum types. genisoimage * tools/imagesums: Add support for more checksum types. genisoimage
will shortly start generating sha256 and sha512 sums too. 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 -- Frans Pop <fjp@debian.org> Sun, 15 Feb 2009 23:41:25 +0100

6
tools/sort_deps
View File

@ -308,14 +308,16 @@ sub read_depends {
my $i = shift; # Ref my $i = shift; # Ref
my $lines = shift; # Ref my $lines = shift; # Ref
my $pkg = shift; # string 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 (@dep, @rec, @sug);
my ($type, $or, $elt); my ($type, $or, $elt);
while ($lines->[$$i] =~ m/^\s([\s\|])($types):/) { while ($lines->[$$i] =~ m/^\s([\s\|])($types):/) {
$type = $2; $or = $1; $type = $2; $or = $1;
# Get rid of replaces and conflicts ... # 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++; $$i++;
while ($lines->[$$i] =~ m/^\s{4}/) { while ($lines->[$$i] =~ m/^\s{4}/) {
$$i++; $$i++;