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

Extend exclude-file handling 

Now take a colon-separated list to allow for more than one to be
used. And refactor to reduce repetition.
This commit is contained in:
Steve McIntyre 2023-07-04 17:14:04 +01:00
parent 1824a66933
commit 00ea28267d
1 changed files with 48 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
tools/make_disc_trees.pl
View File

@ -795,61 +795,70 @@ sub get_disc_size {
} }
sub start_disc { sub start_disc {
my $error = 0; my $error = 0;
$error = system("$basedir/tools/start_new_disc $basedir $mirror $tdir $codename \"$archlist\" $disknum"); $error = system("$basedir/tools/start_new_disc $basedir $mirror $tdir $codename \"$archlist\" $disknum");
if ($error != 0) { if ($error != 0) {
die " Failed to start disc $disknum, error $error\n"; die " Failed to start disc $disknum, error $error\n";
} }
get_disc_size(); get_disc_size();
print "Starting new \"$archlist\" $disktype $disknum at $basedir/$codename/CD$disknum\n"; print "Starting new \"$archlist\" $disktype $disknum at $basedir/$codename/CD$disknum\n";
print " Specified size for this image: $diskdesc, $maxdiskblocks 2K-blocks maximum\n"; print " Specified size for this image: $diskdesc, $maxdiskblocks 2K-blocks maximum\n";
# Grab all the early stuff, apart from dirs that will change later # Grab all the early stuff, apart from dirs that will change later
print " Starting the md5sum.txt file\n"; print " Starting the md5sum.txt file\n";
chdir $cddir; chdir $cddir;
system("find . -type f | grep -v -e ^\./\.disk -e ^\./dists | xargs md5sum >> md5sum.txt"); system("find . -type f | grep -v -e ^\./\.disk -e ^\./dists | xargs md5sum >> md5sum.txt");
chdir $bdir; chdir $bdir;
$mkisofs_opts = ""; $mkisofs_opts = "";
$mkisofs_dirs = ""; $mkisofs_dirs = "";
undef @exclude_packages; @exclude_packages = ();
undef @unexclude_packages; @unexclude_packages = ();
# Change of interface here - exclude/unexclude files are now a
# colon-separated list
if (defined ($ENV{"EXCLUDE"})) { if (defined ($ENV{"EXCLUDE"})) {
my $excl_file = $ENV{"TASKDIR"} . "/" . $ENV{"EXCLUDE"}; add_excludes_from_files($ENV{"EXCLUDE"}, "exclude", \@exclude_packages)
print LOG "Adding excludes from $excl_file\n";
open (EXCLUDE_FILE, "< $excl_file") || die "Can't open exclude file $excl_file: $!\n";
while (defined (my $excl_pkg = <EXCLUDE_FILE>)) {
chomp $excl_pkg;
push(@exclude_packages, $excl_pkg);
}
close (EXCLUDE_FILE);
} }
if (defined ($ENV{"EXCLUDE$disknum"})) { if (defined ($ENV{"EXCLUDE$disknum"})) {
my $excl_file = $ENV{"TASKDIR"} . "/" . $ENV{"EXCLUDE$disknum"}; add_excludes_from_files($ENV{"EXCLUDE$disknum"}, "exclude", \@exclude_packages)
print LOG "Adding excludes from $excl_file\n";
open (EXCLUDE_FILE, "< $excl_file") || die "Can't open exclude file $excl_file: $!\n";
while (defined (my $excl_pkg = <EXCLUDE_FILE>)) {
chomp $excl_pkg;
push(@exclude_packages, $excl_pkg);
}
close (EXCLUDE_FILE);
} }
if (defined ($ENV{"UNEXCLUDE$disknum"})) { if (defined ($ENV{"UNEXCLUDE$disknum"})) {
my $excl_file = $ENV{"TASKDIR"} . "/" . $ENV{"UNEXCLUDE$disknum"}; add_excludes_from_files($ENV{"UNEXCLUDE$disknum"}, "unexclude", \@unexclude_packages)
print LOG "Adding unexcludes from $excl_file\n";
open (EXCLUDE_FILE, "< $excl_file") || die "Can't open unexclude file $excl_file: $!\n";
while (defined (my $excl_pkg = <EXCLUDE_FILE>)) {
chomp $excl_pkg;
push(@unexclude_packages, $excl_pkg);
}
close (EXCLUDE_FILE);
} }
} }
sub add_excludes_from_files {
my $files_list = shift;
my $verb = shift;
my $listref = shift;
foreach my $entry (split(':', $files_list)) {
my $excl_file = $ENV{"TASKDIR"} . "/" . $entry;
parse_exclude_file($excl_file, $verb, $listref)
}
}
sub parse_exclude_file {
my $excl_file = shift;
my $verb = shift;
my $listref = shift;
my @list = @$listref;
print " Adding packages to $verb list from $excl_file\n";
print LOG "Adding packages to $verb list from $excl_file\n";
open (EXCLUDE_FILE, "< $excl_file") || die "Can't open exclude file $excl_file: $!\n";
while (defined (my $excl_pkg = <EXCLUDE_FILE>)) {
chomp $excl_pkg;
push(@exclude_packages, $excl_pkg);
print LOG " $excl_pkg\n";
}
close (EXCLUDE_FILE);
}
sub finish_disc { sub finish_disc {
my $cddir = shift; my $cddir = shift;
my $not = shift; my $not = shift;