[23824] in Source-Commits
/svn/athena r23436 - trunk/debathena/scripts
daemon@ATHENA.MIT.EDU (amb@MIT.EDU)
Wed Jan 28 16:44:17 2009
Date: Wed, 28 Jan 2009 16:43:48 -0500 (EST)
From: amb@MIT.EDU
Message-Id: <200901282143.QAA16391@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: amb
Date: 2009-01-28 16:43:47 -0500 (Wed, 28 Jan 2009)
New Revision: 23436
Modified:
trunk/debathena/scripts/gen-packages
Log:
Correctly deal with packages that have debian/control.in but not debian/control.
Modified: trunk/debathena/scripts/gen-packages
===================================================================
--- trunk/debathena/scripts/gen-packages 2009-01-27 06:09:59 UTC (rev 23435)
+++ trunk/debathena/scripts/gen-packages 2009-01-28 21:43:47 UTC (rev 23436)
@@ -53,16 +53,19 @@
rm -f packages.unsorted
echo "Scanning file list of $loc"
if [ $type = repos ]; then
- for cf in $(svn ls -R $loc | grep 'debian/control$'); do
+ for cf in $(svn ls -R $loc | egrep 'debian/control(\.in)*$'); do
echo "Reading $cf"
name=$(svn cat $loc/$cf | sed -ne 's/^Source: \(.*\)$/\1/p')
+ dir=${cf%.in}
dir=${cf%/debian/control}
printf "%-35s %s\n" $name $dir >> packages.unsorted
done
else
- for cf in $(cd $loc && find | sed -ne '/debian\/control$/s/^\.\///p'); do
+ for cf in $(cd $loc && find | egrep 'debian/control(\.in)*$' \
+ | sed -ne 's/^\.\///p'); do
echo "Reading $cf"
name=$(sed -ne 's/^Source: \(.*\)$/\1/p' $loc/$cf)
+ dir=${cf%.in}
dir=${cf%/debian/control}
printf "%-35s %s\n" $name $dir >> packages.unsorted
done
@@ -83,5 +86,5 @@
# cyrus-sasl2-mit has a debian dir but is really a debathenify package.
# config-package dev has some example packages we want to filter out.
-sort packages.unsorted | egrep -v "cyrus-sasl2-mit|/examples/|$gdm" > packages
+sort -u packages.unsorted | egrep -v "cyrus-sasl2-mit|/examples/|$gdm" > packages
rm -f packages.unsorted
