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

Use 'or' instead of '||' when testing result of calls to open (because of precendence rules)

This commit is contained in:
Frans Pop 2008-01-05 23:53:27 +00:00
parent 0db7484988
commit eeb3b9abfc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/make_disc_trees.pl
View File

@ -45,7 +45,7 @@ my $list = "$tdir/list";
my $list_ex = "$tdir/list.exclude"; my $list_ex = "$tdir/list.exclude";
my $bdir = "$tdir/$codename"; my $bdir = "$tdir/$codename";
my $log = "$bdir/make_disc_tree.log"; my $log = "$bdir/make_disc_tree.log";
open(LOG, ">> $log") || die ("Can't open logfile $log for writing: $!\n"); open(LOG, ">> $log") or die ("Can't open logfile $log for writing: $!\n");
foreach my $arch (split(' ', $archlist)) { foreach my $arch (split(' ', $archlist)) {
push(@arches, $arch); push(@arches, $arch);
@ -113,7 +113,7 @@ if ($archlist =~ /m68k/ || $archlist =~ /powerpc/) {
print "Starting to lay out packages into $disktype ($diskdesc) images: $maxdiskblocks 2K-blocks maximum per image\n"; print "Starting to lay out packages into $disktype ($diskdesc) images: $maxdiskblocks 2K-blocks maximum per image\n";
open(INLIST, "$bdir/packages") || die "No packages file!\n"; open(INLIST, "$bdir/packages") or die "No packages file!\n";
while (defined (my $pkg = <INLIST>)) { while (defined (my $pkg = <INLIST>)) {
chomp $pkg; chomp $pkg;
$cddir = "$bdir/CD$disknum"; $cddir = "$bdir/CD$disknum";
@ -561,7 +561,7 @@ sub finish_disc {
print " Finishing off the Release file\n"; print " Finishing off the Release file\n";
chdir "dists/$codename"; chdir "dists/$codename";
open(RELEASE, ">>Release") || die "Failed to open Release file: $!\n"; open(RELEASE, ">>Release") or die "Failed to open Release file: $!\n";
print RELEASE "MD5Sum:\n"; print RELEASE "MD5Sum:\n";
find (\&recompress, "."); find (\&recompress, ".");
find (\&md5_files_for_release, "."); find (\&md5_files_for_release, ".");
@ -570,7 +570,7 @@ sub finish_disc {
print " Finishing off md5sum.txt\n"; print " Finishing off md5sum.txt\n";
# Just md5 the bits we won't have seen already # Just md5 the bits we won't have seen already
open(MD5LIST, ">>md5sum.txt") || die "Failed to open md5sum.txt file: $!\n"; open(MD5LIST, ">>md5sum.txt") or die "Failed to open md5sum.txt file: $!\n";
find (\&md5_files_for_md5sum, ("./.disk", "./dists")); find (\&md5_files_for_md5sum, ("./.disk", "./dists"));
close(MD5LIST); close(MD5LIST);