[Blends-commit] r3379 - /blends/trunk/machine_readable/fetch-machine-readable

[tille at users.alioth.debian.org]

Author: tille
Date: Wed May 30 15:11:26 2012
New Revision: 3379

URL: http://svn.debian.org/wsvn/blends/?sc=1&rev=3379
Log:
Be more robust when detecting package names and changelog files from different SVNs

Modified:
    blends/trunk/machine_readable/fetch-machine-readable

Modified: blends/trunk/machine_readable/fetch-machine-readable
URL: http://svn.debian.org/wsvn/blends/blends/trunk/machine_readable/fetch-machine-readable?rev=3379&op=diff
==============================================================================
--- blends/trunk/machine_readable/fetch-machine-readable (original)
+++ blends/trunk/machine_readable/fetch-machine-readable Wed May 30 15:11:26 2012
@@ -47,7 +47,7 @@
   if grep -q "/trunk/debian/" $TMPLIST ; then
     # for Debian Med and Debian Science layout
     svndir=`echo $1 | sed 's?^[^/]*/??'`
-    sed -e 's?debian/.*??' -e 's?trunk/.*??' $TMPLIST | sed -e "s?^$svndir/??" -e 's+/$++' | sort | uniq > $PKGLIST
+    sed -e 's?debian/.*??' -e 's?trunk/.*??' $TMPLIST | sed -e "s?^$svndir/??" -e 's+/$++' -e 's#^[^/]\+/\([^/]\+\)/.*#\1#' -e 's#^[^/]\+/\([^/]\+\)$#\1#' | sort | uniq > $PKGLIST
     trunklayout="/trunk"
   else
     # for DebiChemn layout
@@ -57,7 +57,7 @@
 #  set -x
   for pkgdir in `cat $PKGLIST` ; do
     pkg=`echo $pkgdir | sed -e 's?^.*/\([^/]\+\)?\1?'`
-    chlog=`grep -e "/$pkg/trunk/debian/changelog$" -e "^$pkg/trunk/debian/changelog$" -e "^$pkg/debian/changelog$" -e "/$pkg/debian/changelog$" $TMPLIST 2>/dev/null`
+    chlog=`grep  -e "/$pkg/[^/]\+/debian/changelog$" -e "^$pkg/trunk/debian/changelog$" -e "^$pkg/debian/changelog$" -e "/$pkg/debian/changelog$" $TMPLIST | sort | tail -n 1 2>/dev/null`
     ## DEBUG
     # echo "$pkgdir -> $pkg ($chlog)"
     if [ "" != "$chlog" ] ; then