Bug#650149: Patch

[Martin von Wittich]

Tags: Patch

I've fixed this bug in our simple-cdd installation. Patch is appended.

-- 
Mit freundlichen GrÌßen,

Martin v. Wittich

IServ GmbH
Rebenring 33
38106 Braunschweig

Telefon:   0531-2243666-0
Fax:       0531-2243666-9
E-Mail:    martin.von.witt...@iserv.eu
Internet:  iserv.eu

USt.-IdNr.:       DE265149425
Registergericht:  Amtsgericht Braunschweig
Registernummer:   HRB 201822
GeschÀftsfÌhrer:  Jörg Ludwig

--- /usr/share/simple-cdd/tools/build/debian-cd.orig	2010-06-20 10:15:56.000000000 +0200
+++ /usr/share/simple-cdd/tools/build/debian-cd	2012-06-07 02:33:20.000000000 +0200
@@ -161,9 +161,22 @@
 make image CD=1
 
 if [ -x /usr/bin/edos-debcheck ]; then
-    # check for missing dependencies with edos-debcheck, ignoring debian-installer files which are a little unusual
-    for p in $(find $TDIR/$CODENAME/CD1/dists/ -name Packages | egrep -v debian-installer) ; do
-        echo "checking for missing dependencies with edos-debcheck: $p"
-        edos-debcheck -failures -explain < $p
-    done
+    # check for missing dependencies with edos-debcheck, ignoring
+    # debian-installer files which are a little unusual
+    (
+      cd "$TDIR/$CODENAME/CD1/dists"
+
+      # create a list of architectures, e.g. binary-i386, binary-amd64
+      find . -regex './[^/]*/[^/]*/debian-installer' -prune -o \( \
+          -name Packages -print \) | awk -F '/' '{print $4}' | sort | uniq | \
+          # loop through these architectures
+          while read i
+          do
+            # pipe all Packages files that belong to the current architecture
+            # to edos-debcheck
+            echo "Checking $i:"
+            find . -regex "./[^/]*/[^/]*/$i/.*" -name Packages \
+                -exec cat {} \; | edos-debcheck -failures -explain
+          done
+    )
 fi