From 5ab298e730a0b9dfa5a2c2e16c288882d9cff337 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Sun, 25 Mar 2001 14:49:14 +0000
Subject: [PATCH] * Does now detect packages in non-free even if there are no  
 other packages (from main) on the CD.

---
 tools/scanpackages | 8 ++++++--
 tools/scansources  | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/scanpackages b/tools/scanpackages
index f938c42c..afc8cd5f 100755
--- a/tools/scanpackages
+++ b/tools/scanpackages
@@ -147,10 +147,14 @@ DISTS=""
 DISTSNONUS=""
 for i in `cd dists; echo *; cd ..`; do
     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"
 	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"
 	fi
     fi
diff --git a/tools/scansources b/tools/scansources
index 779ca69b..5a94c81b 100755
--- a/tools/scansources
+++ b/tools/scansources
@@ -22,10 +22,14 @@ DISTS=""
 DISTSNONUS=""
 for i in `cd dists; echo *; cd ..`; do
     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"
         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"
         fi
     fi