On Sun, Apr 08, 2001 at 06:10:20PM +0100, Steve McIntyre wrote:
>I've been trying to create some woody CDs this weekend and it looks
>like changes in scansources are slightly broken. Expect a patch and
>checkin shortly.

I'm about to check in the following - there was a clear bug in the
non-US handling, and some edge conditions that could cause a build to
fail...

-- 
Steve McIntyre, Cambridge, UK.                   [EMAIL PROTECTED]
  Getting a SCSI chain working is perfectly simple if you remember that there
  must be exactly three terminations: one on one end of the cable, one on the
  far end, and the goat, terminated over the SCSI chain with a silver-handled
  knife whilst burning *black* candles. --- Anthony DeBoer
Index: tools/scansources
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/scansources,v
retrieving revision 1.6
diff -u -r1.6 scansources
--- tools/scansources   2001/03/25 14:49:14     1.6
+++ tools/scansources   2001/04/08 17:29:10
@@ -37,24 +37,32 @@
 for SECT in $SECTIONS; do
 
        if [ -d "pool/$SECT" ]; then
-           dpkg-scansources pool/$SECT > dists/$CODENAME/$SECT/source/Sources
+               dpkg-scansources pool/$SECT > dists/$CODENAME/$SECT/source/Sources
        fi
        for DIST in $DISTS; do
-           dpkg-scansources dists/$DIST/$SECT/source \
-               >> dists/$CODENAME/$SECT/source/Sources
+               if [ -d "dists/$DIST/$SECT/source" ] ; then
+                       dpkg-scansources dists/$DIST/$SECT/source \
+                       >> dists/$CODENAME/$SECT/source/Sources
+               fi
        done
-        gzip --best dists/$CODENAME/$SECT/source/Sources
-   
+       if [ -f dists/$CODENAME/$SECT/source/Sources ] ; then
+               gzip --best dists/$CODENAME/$SECT/source/Sources
+       fi
+
        if [ -n "$NONUS" -a "$CODENAME" != "slink" ]; then
-           if [ -d "pool/non-US/$SECT" ]; then
-               dpkg-scansources pool/non-US/$SECT \
-                       > dists/$CODENAME/$SECT/source/Sources
-           fi
-           for DIST in $DISTSNONUS; do
-               dpkg-scansources dists/$DIST/non-US/$SECT/source \
-                       >> dists/$CODENAME/$SECT/source/Sources
-           done
-           gzip --best dists/$CODENAME/non-US/$SECT/source/Sources
+               if [ -d "pool/non-US/$SECT" ]; then
+                       dpkg-scansources pool/non-US/$SECT \
+                       > dists/$CODENAME/non-US/$SECT/source/Sources
+               fi
+               for DIST in $DISTSNONUS; do
+                       if [ -d "dists/$DIST/non-US/$SECT/source" ] ; then
+                               dpkg-scansources dists/$DIST/non-US/$SECT/source \
+                                       >> dists/$CODENAME/non-US/$SECT/source/Sources 
+         
+                       fi
+               done
+               if [ -f dists/$CODENAME/non-US/$SECT/source/Sources ] ; then
+                       gzip --best dists/$CODENAME/non-US/$SECT/source/Sources
+               fi
        fi
        
 done

Reply via email to