[Blends-commit] [SCM] website branch, master, updated. 37af0793def2c46dcc351ab4a58386ccfc858169

[Andreas Tille]

The following commit has been merged in the master branch:
commit 37af0793def2c46dcc351ab4a58386ccfc858169
Author: Andreas Tille <tille at debian.org>
Date:   Sun Sep 13 14:29:02 2015 +0200

    Fix several bugs

diff --git a/misc/machine_readable/fetch-machine-readable b/misc/machine_readable/fetch-machine-readable
index 636db14..b6cd82a 100755
--- a/misc/machine_readable/fetch-machine-readable
+++ b/misc/machine_readable/fetch-machine-readable
@@ -51,7 +51,7 @@ svn_get_README_Debian () {
                   mv $file $TARGETDIR/$firstletter/${srcname}.README.Debian
                 else
                   rdfirstletter=`echo $file | sed "s/^\(.\).*/\1/"`
-                  mv $file $TARGETDIR/$rdfirstletter/${file}
+                  mv $file $TARGETDIR/$rdfirstletter/${file} || echo "No file $file for $pkg found (in svn_get_README_Debian)" >> $ERRLOG
                 fi
                 echo "README.Debian: $file" >> $TARGETDIR/$firstletter/${srcname}.vcs
               done
@@ -84,7 +84,7 @@ svn_checkout_machine_readable () {
 #  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$" -e "/$pkg/debian/.*README.Debian$" -e "^[a-z]\+/$pkg/[a-z]\+/trunk/debian/changelog$" $TMPLIST | sort | tail -n 1 2>/dev/null`
+    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/svn/$1/$chlog >/dev/null
       srcname=`dpkg-parsechangelog -lchangelog 2>/dev/null | sed -n 's/^Source: //p'`
@@ -125,12 +125,12 @@ svn_checkout_machine_readable () {
             if [ "" != "$getfile" ] ; then
               svn export svn://localhost/svn/$1/$getfile >/dev/null 2>/dev/null
               if [ -e $srcfile ] ; then
-                mv $srcfile $TARGETDIR/$firstletter/${srcname}.$destfile
+                mv $srcfile $TARGETDIR/$firstletter/${srcname}.$destfile || echo "No file $srcfile for $pkg found (in second try to fetch data from svn)" >> $ERRLOG
               else
                 echo "ERR 1: Can not obtain file ${file} of source ${srcname} of team $1 from ${getfile}" >> $ERRLOG
               fi
             else
-              if ! `echo $vcslocation | grep -q trunk` ; then
+              if ! echo $vcslocation | grep -q -e trunk -e "branch.*etch" ; then
                 if [ "$destfile" != "upstream" ] ; then
                   echo "Package $pkg is lacking trunk directory in vcslocation ${vcslocation}. Try to find file $file anyway." >> $ERRLOG
                   if [ "$file" = "README.Debian" ] ; then
@@ -141,7 +141,7 @@ svn_checkout_machine_readable () {
                     if [ "" != "$getfile" ] ; then
                       svn export svn://localhost/svn/$1/$getfile >/dev/null 2>/dev/null
                       if [ -e $srcfile ] ; then
-                        mv $srcfile $TARGETDIR/$firstletter/${srcname}.$destfile
+                        mv $srcfile $TARGETDIR/$firstletter/${srcname}.$destfile || echo "No file $srcfile for $pkg found (in third try to fetch data from svn)" >> $ERRLOG
                       else
                         echo "ERR 2: Can not obtain file ${file} of source ${srcname} of team $1 from ${getfile}" >> $ERRLOG
                       fi
@@ -156,7 +156,6 @@ svn_checkout_machine_readable () {
         fi
       else
         echo "Can not parse changelog for source name of $pkg" >> $ERRLOG
-        mv changelog ${pkg}.broken.changelog
       fi
     else
       echo "No changelog found for $pkg" >> $ERRLOG
@@ -176,7 +175,7 @@ git_checkout_machine_readable () {
     srcname=`dpkg-parsechangelog -l$TMPCHLOG 2>/dev/null | sed -n 's/^Source: //p'`
     firstletter=`echo $srcname | sed "s/^\(.\).*/\1/"`
     mkdir -p $TARGETDIR/$firstletter
-    mv $TMPCHLOG $TARGETDIR/$firstletter/${srcname}.changelog
+    mv $TMPCHLOG $TARGETDIR/$firstletter/${srcname}.changelog || echo "No file $TMPCHLOG for $1 found (in git_checkout_machine_readable)" >> $ERRLOG
     echo "Vcs-Git: git://anonscm.debian.org$1" > $TARGETDIR/$firstletter/${srcname}.vcs
     echo "Vcs-Browser: https://anonscm.debian.org"`echo $1 | sed 's+^/git/+/cgit/+'` >> $TARGETDIR/$firstletter/${srcname}.vcs
     echo "Blend: `echo $2 | sed 's?/.*??'`" >> $TARGETDIR/$firstletter/${srcname}.vcs
@@ -189,11 +188,11 @@ git_checkout_machine_readable () {
         destfile=${file%/metadata}
         target=$TARGETDIR/$firstletter/${srcname}.`echo $destfile | sed 's?debian/??'`
         if echo $file | grep -q README.Debian ; then
-          if [ "$file" = "debian/README.Debian" ] ; then
+          rdfile=`basename $file`
+          if [ "$rdfile" = "README.Debian" ] ; then
             git show HEAD:$file > $target
             echo "README.Debian: `basename $file`" >> $TARGETDIR/$firstletter/${srcname}.vcs
           else
-            rdfile=`basename $file`
             rdfirstletter=`echo $rdfile | sed "s/^\(.\).*/\1/"`
             git show HEAD:$file > $TARGETDIR/$rdfirstletter/${rdfile}
             echo "README.Debian: $rdfile" >> $TARGETDIR/$firstletter/${srcname}.vcs

-- 
Static and dynamic websites for Debian Pure Blends