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

* Exclude packages and add all task present ones before resolve 

dependencies, avoiding OR dependencies to take their place and removed
  packages dependencies to be included. Closes: #410418.
This commit is contained in:
Otavio Salvador 2007-09-28 18:41:02 +00:00
parent c569885764
commit e0213e29ca
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -15,6 +15,9 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
* Exclude multipath-udeb and libaio1-udeb since they're not being use
yet.
* Fix autorun.inf generation when win32-loader is present.
* Exclude packages and add all task present ones before resolve
dependencies, avoiding OR dependencies to take their place and removed
packages dependencies to be included. Closes: #410418.
[ Steve McIntyre ]
* Make daily i386/amd64 lenny builds work again - don't attempt to copy
@ -31,7 +34,7 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
[ Joey Hess ]
* Include dmraid deb. Closes: #443991
-- Joey Hess <joeyh@debian.org> Thu, 27 Sep 2007 13:44:56 -0400
-- Otavio Salvador <otavio@debian.org> Fri, 28 Sep 2007 15:40:56 -0300
debian-cd (3.0.3) unstable; urgency=low

23
tools/list2cds
View File

@ -104,6 +104,16 @@ if (not $nonfree) {
}
}
open (EXCLUDE_LIST, "< $exclude") || die "Can't open $exclude : $!\n";
while (defined($_=<EXCLUDE_LIST>)) {
chomp;
next if m/^\s*$/;
next if $excluded{$_};
$excluded{$_} = 'list';
$count_excl++;
}
close EXCLUDE_LIST;
msg(1, "Statistics:
Number of packages: @{ [scalar(keys %packages)] }
Number of excluded: $count_excl of @{ [scalar(keys %excluded)] }
@ -179,10 +189,20 @@ while (defined($_=<LIST>)) {
next;
}
next if $excluded{$_};
if ($included{$_}) {
if ($included{$_} == -1) {
msg(3, "$_ has already been included.\n");
next;
}
$included{$_} = -1;
}
close LIST;
foreach (keys %included) {
next if ($included{$_} != -1);
$included{$_} = 0;
# This is because udebs tend to have bad dependencies but work
# nevertheless ... this may be removed once the udebs have a
# better depencency system
@ -192,7 +212,6 @@ while (defined($_=<LIST>)) {
add_package ($_, ! $norecommends, ! $nosuggests);
}
}
close LIST;
msg(0, " Now up to $cd_size bytes\n");
# All requested packages have been included