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 indentation

This commit is contained in:
Frans Pop 2007-06-22 15:18:10 +00:00
parent febd6c144e
commit f096552f3b
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/add_packages
View File

@ -330,12 +330,14 @@ sub add_packages {
$source = $mirror; $source = $mirror;
if ($arch eq "source") { if ($arch eq "source") {
m/^Directory: (\S+)/m and $pdir = $1; m/^Directory: (\S+)/m and $pdir = $1;
$source=$localdebs if $pdir=~m:local/:;
$source=$security if $pdir=~m:updates/:; $source=$security if $pdir=~m:updates/:;
m/^ (\S+) (\S+) ((\S+).*dsc)/m and push(@files, "$pdir/$3"); m/^ (\S+) (\S+) ((\S+).*dsc)/m and push(@files, "$pdir/$3");
m/^ (\S+) (\S+) ((\S+).*diff.gz)/m and push(@files, "$pdir/$3"); m/^ (\S+) (\S+) ((\S+).*diff.gz)/m and push(@files, "$pdir/$3");
m/^ (\S+) (\S+) ((\S+).*tar.gz)/m and push(@files, "$pdir/$3"); m/^ (\S+) (\S+) ((\S+).*tar.gz)/m and push(@files, "$pdir/$3");
} else { } else {
m/^Filename: (\S+)/mi and push(@files, $1); m/^Filename: (\S+)/mi and push(@files, $1);
$source=$localdebs if $1=~m:local/:;
$source=$security if $1=~m:updates/:; $source=$security if $1=~m:updates/:;
} }
@ -347,14 +349,6 @@ sub add_packages {
foreach my $file (@files) { foreach my $file (@files) {
my $missing = 0; my $missing = 0;
# Count how big the file is we're removing, for checking if the disc is full # Count how big the file is we're removing, for checking if the disc is full
if (! -e "$source/$file") {
msg_ap(0, "Can't find $file in the main archive, trying local\n");
if (-e "$localdebs/$file") {
$source = $localdebs;
} else {
die "$file not found under either $source or $localdebs\n";
}
}
$realfile = real_file ("$source/$file"); $realfile = real_file ("$source/$file");
$total_blocks -= get_file_blocks($realfile); $total_blocks -= get_file_blocks($realfile);
@ -367,16 +361,7 @@ sub add_packages {
$total_blocks += add_md5_entry($dir, $arch, $_); $total_blocks += add_md5_entry($dir, $arch, $_);
foreach my $file (@files) { foreach my $file (@files) {
# And put the file in the CD tree (with a (hard) link) # And put the file in the CD tree (with a (hard) link)
if (! -e "$source/$file") {
msg_ap(0, "Can't find $file in the main archive, trying local\n");
if (-e "$localdebs/$file") {
$source = $localdebs;
} else {
die "$file not found under either $source or $localdebs\n";
}
}
$realfile = real_file ("$source/$file"); $realfile = real_file ("$source/$file");
if (! -e "$dir/$file") { if (! -e "$dir/$file") {

2
tools/merge_package_lists
View File

@ -98,7 +98,7 @@ if [ $source = "yes" ] ; then
included[source] = pkg included[source] = pkg
incarch[source] = arch incarch[source] = arch
indexnr[source] = FNR indexnr[source] = FNR
sourcecomp[source] = component sourcecomp[source] = component
} else { } else {
if (FNR < indexnr[source]) { if (FNR < indexnr[source]) {
printf("# Updating source %s: was due to %d:%s:%s, now moved earlier because of %d:%s:%s\n", printf("# Updating source %s: was due to %d:%s:%s, now moved earlier because of %d:%s:%s\n",