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

* Check if required base packages might also be supplied by a local 

repository too, not just the main distribution. Closes: #425600
This commit is contained in:
Steve McIntyre 2007-08-26 15:19:00 +00:00
parent a10d15179c
commit dd8d42703b
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -72,6 +72,8 @@ debian-cd (3.0.3) UNRELEASED; urgency=low
$CODENAME - allows for sid builds more easily etc. $CODENAME - allows for sid builds more easily etc.
* Recompress the Packages files separately just before generating * Recompress the Packages files separately just before generating
Release files. Closes: #423835, thanks to fjp for the patch. Release files. Closes: #423835, thanks to fjp for the patch.
* Check if required base packages might also be supplied by a local
repository too, not just the main distribution. Closes: #425600
-- Joey Hess <joeyh@debian.org> Tue, 07 Aug 2007 18:57:05 -0700 -- Joey Hess <joeyh@debian.org> Tue, 07 Aug 2007 18:57:05 -0700

9
tools/make_disc_trees.pl
View File

@ -308,6 +308,15 @@ sub check_base_installable {
} }
close PLIST; close PLIST;
$packages_file = "$cddir/dists/$codename/local/binary-$arch/Packages";
if (open (PLIST, $packages_file)) {
while (defined($p = <PLIST>)) {
chomp $p;
$p =~ m/^Package: (\S+)/ and $on_disc{$1} = $1;
}
close PLIST;
}
if (defined($ENV{'BASE_EXCLUDE'})) { if (defined($ENV{'BASE_EXCLUDE'})) {
open (ELIST, $ENV{'BASE_EXCLUDE'}) open (ELIST, $ENV{'BASE_EXCLUDE'})
|| die "Can't open base_exclude file $ENV{'BASE_EXCLUDE'} : $!\n"; || die "Can't open base_exclude file $ENV{'BASE_EXCLUDE'} : $!\n";