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

Fix regressions found on r1475 walking on the queued packages twice

This commit is contained in:
Otavio Salvador 2007-10-29 22:58:25 +00:00
parent 35ef242061
commit 8f92855bb7
2 changed files with 35 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 * Exclude multipath-udeb and libaio1-udeb since they're not being use
yet. yet.
* Fix autorun.inf generation when win32-loader is present. * 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.
* Applied patch from Nicolas François <nicolas.francois@centraliens.net> * Applied patch from Nicolas François <nicolas.francois@centraliens.net>
to allow README.html translation using po4a. to allow README.html translation using po4a.
* Remove the 'Last Modified' date from data/lenny/README.html.in since * Remove the 'Last Modified' date from data/lenny/README.html.in since
@ -37,7 +40,7 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
[ Joey Hess ] [ Joey Hess ]
* Include dmraid deb. Closes: #443991 * 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 debian-cd (3.0.3) unstable; urgency=low

33
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: msg(1, "Statistics:
Number of packages: @{ [scalar(keys %packages)] } Number of packages: @{ [scalar(keys %packages)] }
Number of excluded: $count_excl of @{ [scalar(keys %excluded)] } Number of excluded: $count_excl of @{ [scalar(keys %excluded)] }
@ -179,10 +189,21 @@ while (defined($_=<LIST>)) {
next; next;
} }
next if $excluded{$_}; next if $excluded{$_};
if ($included{$_}) { if ($included{$_} == 1) {
msg(3, "$_ has already been included.\n"); msg(3, "$_ has already been included.\n");
next; next;
} }
$included{$_} = 1;
}
close LIST;
# List first add the packages on the list so we give them priority
foreach (keys %included) {
next if ($included{$_} != 1 && !$packages{$_}{"IsUdeb"});
$included{$_} = 1
# This is because udebs tend to have bad dependencies but work # This is because udebs tend to have bad dependencies but work
# nevertheless ... this may be removed once the udebs have a # nevertheless ... this may be removed once the udebs have a
# better depencency system # better depencency system
@ -192,7 +213,15 @@ while (defined($_=<LIST>)) {
add_package ($_, ! $norecommends, ! $nosuggests); add_package ($_, ! $norecommends, ! $nosuggests);
} }
} }
close LIST;
# Now, let's add all the rest
foreach (keys %included) {
next if ($included{$_} == 1);
$included{$_} = 0;
add_package ($_, ! $norecommends, ! $nosuggests);
}
msg(0, " Now up to $cd_size bytes\n"); msg(0, " Now up to $cd_size bytes\n");
# All requested packages have been included # All requested packages have been included