* Does now detect packages in non-free even if there are no

other packages (from main) on the CD.
This commit is contained in:
Raphaël Hertzog 2001-03-25 14:49:14 +00:00
parent 8d5ca3775b
commit 5ab298e730
2 changed files with 12 additions and 4 deletions

View File

@ -147,10 +147,14 @@ DISTS=""
DISTSNONUS="" DISTSNONUS=""
for i in `cd dists; echo *; cd ..`; do for i in `cd dists; echo *; cd ..`; do
if [ ! -L "dists/$i" -a -d "dists/$i" ]; then if [ ! -L "dists/$i" -a -d "dists/$i" ]; then
if [ -d "dists/$i/main/binary-$ARCH" ]; then if [ -d "dists/$i/main/binary-$ARCH" -o \
-d "dists/$i/non-free/binary-$ARCH" -o \
-d "dists/$i/contrib/binary-$ARCH" ]; then
DISTS="$DISTS $i" DISTS="$DISTS $i"
fi fi
if [ -d "dists/$i/non-US/main/binary-$ARCH" ]; then if [ -d "dists/$i/non-US/main/binary-$ARCH" -o \
-d "dists/$i/non-US/non-free/binary-$ARCH" -o \
-d "dists/$i/non-US/contrib/binary-$ARCH" ]; then
DISTSNONUS="$DISTSNONUS $i" DISTSNONUS="$DISTSNONUS $i"
fi fi
fi fi

View File

@ -22,10 +22,14 @@ DISTS=""
DISTSNONUS="" DISTSNONUS=""
for i in `cd dists; echo *; cd ..`; do for i in `cd dists; echo *; cd ..`; do
if [ ! -L "dists/$i" -a -d "dists/$i" ]; then if [ ! -L "dists/$i" -a -d "dists/$i" ]; then
if [ -d "dists/$i/main/source" ]; then if [ -d "dists/$i/main/source" -o \
-d "dists/$i/non-free/source" -o \
-d "dists/$i/contrib/source" ]; then
DISTS="$DISTS $i" DISTS="$DISTS $i"
fi fi
if [ -d "dists/$i/non-US/main/source" ]; then if [ -d "dists/$i/non-US/main/source" -o \
-d "dists/$i/non-US/non-free/source" -o \
-d "dists/$i/non-US/contrib/source" ]; then
DISTSNONUS="$DISTSNONUS $i" DISTSNONUS="$DISTSNONUS $i"
fi fi
fi fi