[Blends-commit] [SCM] website branch, master, updated. 55af80fa51c2514aa41dad1d5f6ca4a236616e89

Andreas Tille tille at debian.org
Tue Jul 16 20:29:11 UTC 2013


The following commit has been merged in the master branch:
commit 55af80fa51c2514aa41dad1d5f6ca4a236616e89
Author: Andreas Tille <tille at debian.org>
Date:   Tue Jul 16 22:24:38 2013 +0200

    redirect errors when svn export failed to logfile rather than stderr

diff --git a/misc/machine_readable/fetch-machine-readable b/misc/machine_readable/fetch-machine-readable
index 15f6fc2..19897ca 100755
--- a/misc/machine_readable/fetch-machine-readable
+++ b/misc/machine_readable/fetch-machine-readable
@@ -81,16 +81,24 @@ svn_checkout_machine_readable () {
           for file in control copyright upstream ; do
             getfile=`grep -e "/$pkg/trunk/debian/$file$" -e "^$pkg/trunk/debian/$file$" -e "^$pkg/debian/$file$" -e "trunk/$pkg/debian/$file$" -e "/$pkg/[a-z]\+/trunk/debian/$file$" $TMPLIST 2>/dev/null`
             if [ "" != "$getfile" ] ; then
-              svn export svn://localhost/$1/$getfile >/dev/null
-              mv $file $TARGETDIR/$firstletter/${srcname}.$file
+              svn export svn://localhost/$1/$getfile >/dev/null 2>/dev/null
+              if [ -e $file ] ; then
+                mv $file $TARGETDIR/$firstletter/${srcname}.$file
+              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 [ "$file" != "upstream" ] ; then
                   echo "Package $pkg is lacking trunk directory in vcslocation ${vcslocation}. Try to find file $file anyway." >> $ERRLOG
                   getfile=`grep -e "$vcslocation/debian/$file$" $TMPLIST 2>/dev/null`
                   if [ "" != "$getfile" ] ; then
-                    svn export svn://localhost/$1/$getfile >/dev/null
-                    mv $file $TARGETDIR/$firstletter/${srcname}.$file
+                    svn export svn://localhost/$1/$getfile >/dev/null 2>/dev/null
+                    if [ -e $file ] ; then
+                      mv $file $TARGETDIR/$firstletter/${srcname}.$file
+                    else
+                      echo "ERR 2: Can not obtain file ${file} of source ${srcname} of team $1 from ${getfile}" >> $ERRLOG
+                    fi
                   else
                     if [ "$file" != "upstream" ] ; then
                       echo "Did not found $file for package $pkg (`grep "$pkg" $TMPLIST | grep "$file"`)" >> $ERRLOG

-- 
Static and dynamic websites for Debian Pure Blends



More information about the Blends-commit mailing list