X Strike Force SVN commit: rev 619 - branches/4.3.0/sid/debian/scripts

[X Strike Force SVN Admin <branden+svnadmin@deadbeast.net>]

Author: branden
Date: 2003-10-03 01:05:03 -0500 (Fri, 03 Oct 2003)
New Revision: 619

Modified:
   branches/4.3.0/sid/debian/scripts/manifest-install-reconcile
Log:
Practically rewritten.  Basically works more intelligently.  I'll spare you
the details since this is an XSF-visible-only change.  It works much better
now, and runs silently except to utter a remark if it looks like there is a
package that doesn't ship any files for a given architecture (this isn't a
bug if the package isn't built for the architecture in question).  For a
closer look at what's going on set DEBUG in the shell environment to a
non-null value.

Add vim modeline.

Add $Id$ expando.

Set svn:keywords property to "Id".


Modified: branches/4.3.0/sid/debian/scripts/manifest-install-reconcile
===================================================================
--- branches/4.3.0/sid/debian/scripts/manifest-install-reconcile	2003-10-03 05:52:45 UTC (rev 618)
+++ branches/4.3.0/sid/debian/scripts/manifest-install-reconcile	2003-10-03 06:05:03 UTC (rev 619)
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $Id$
+
 # Run this from the debian/ directory of the unpacked source tree.
 # It will generate INSTALL.$(ARCH) files.  You can then use a command like:
 #   diff -U 0 MANIFEST.$ARCH INSTALL.$ARCH
@@ -34,17 +36,39 @@
 #   debian/control.  Examples include xserver-xfree86* for s390 and xlibosmesa*
 #   for several architectures.
 
+debugmsg () {
+    if [ -n "$DEBUG" ]; then
+        echo "$*" >&2
+    fi
+}
+
+packages=$(grep '^Package:' control | awk '{print $2}')
+
 for F in MANIFEST.*; do
     ARCH=$(echo "$F" | sed 's/MANIFEST\.//')
-    echo $ARCH
+    debugmsg "Processing $ARCH."
     FILE=$(tempfile)
-    for G in *.install; do
-        if [ -e "$G.$ARCH" ]; then
-            awk '{print $1}' < "$G.$ARCH" >> "$FILE"
+    for package in $packages; do
+        # is there an install file for this package at all?
+        if [ "$(echo $package.install*)" = "$package.install*" ]; then
+            debugmsg "No install list for $package."
+            # no; move on to the next package
+            continue
+        fi
+        debugmsg "looking for $package.$ARCH"
+        if [ -e "$package.install.$ARCH" ]; then
+            debugmsg "found arch-specific $package.install.$ARCH file"
+            awk '{print $1}' < "$package.install.$ARCH" >> "$FILE"
+        elif [ -e "$package.install" ]; then
+            debugmsg "falling back to generic $package.install file"
+            awk '{print $1}' < "$package.install" >> "$FILE"
         else
-            awk '{print $1}' < "$G" >> "$FILE"
+            echo "Note: no $package.install file for $ARCH (package not built" \
+                 "for $ARCH?)." >&2
         fi
     done
     sort -u < "$FILE" > "INSTALL.$ARCH"
     rm "$FILE"
 done
+
+# vim:set ai et sts=4 sw=4 tw=80:


Property changes on: branches/4.3.0/sid/debian/scripts/manifest-install-reconcile
___________________________________________________________________
Name: svn:keywords
   + Id