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

[tille at users.alioth.debian.org]

Author: tille
Date: Tue Jun  5 11:31:23 2012
New Revision: 3389

URL: http://svn.debian.org/wsvn/blends/?sc=1&rev=3389
Log:
Also detect packages in a bit nested subdirs (example wrapitk was not detected but is now);
Obtain VCS subdir location from location of changelog which is more reliable than trying to reconstruct

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=3389&op=diff
==============================================================================
--- blends/trunk/machine_readable/fetch-machine-readable (original)
+++ blends/trunk/machine_readable/fetch-machine-readable Tue Jun  5 11:31:23 2012
@@ -57,19 +57,20 @@
 #  set -x
   for pkgdir in `cat $PKGLIST` ; do
     pkg=`echo $pkgdir | sed -e 's?^.*/\([^/]\+\)?\1?'`
-    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)"
+    chlog=`grep  -e "/$pkg/[^/]\+/debian/changelog$" -e "^$pkg/trunk/debian/changelog$" -e "^$pkg/debian/changelog$" -e "/$pkg/debian/changelog$" -e "^[a-z]\+/$pkg/[a-z]\+/trunk/debian/changelog$" $TMPLIST | sort | tail -n 1 2>/dev/null`
     if [ "" != "$chlog" ] ; then
       svn export svn://localhost/$1/$chlog >/dev/null
       srcname=`dpkg-parsechangelog -lchangelog 2>/dev/null | sed -n 's/^Source: //p'`
+      ## DEBUG
+      #echo "$pkgdir -> $pkg ($chlog) -> $srcname"
       if [ "" != "$srcname" ] ; then
+        vcslocation=`echo $chlog | sed 's?debian/changelog$??'`
         trunk="trunk" # at least for Debian Med and Debian Science
         firstletter=`echo $srcname | sed "s/^\(.\).*/\1/"`
         mkdir -p $TARGETDIR/$firstletter
         mv changelog $TARGETDIR/$firstletter/${srcname}.changelog
-        echo "Vcs-Svn: svn://svn.debian.org/$1/$pkgdir/$trunk/" > $TARGETDIR/$firstletter/${srcname}.vcs
-        echo "Vcs-Browser: http://svn.debian.org/wsvn/$1/$pkgdir/$trunk/" >> $TARGETDIR/$firstletter/${srcname}.vcs
+        echo "Vcs-Svn: svn://svn.debian.org/$1/$vcslocation" > $TARGETDIR/$firstletter/${srcname}.vcs
+        echo "Vcs-Browser: http://svn.debian.org/wsvn/$1/$vcslocation" >> $TARGETDIR/$firstletter/${srcname}.vcs
         echo "Blend: `echo $1 | sed 's?/.*??'`" >> $TARGETDIR/$firstletter/${srcname}.vcs
         for file in control copyright upstream ; do
           getfile=`grep -e "/$pkg/trunk/debian/$file$" -e "^$pkg/trunk/debian/$file$" -e "^$pkg/debian/$file$" $TMPLIST 2>/dev/null`