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

[tille at users.alioth.debian.org]

Author: tille
Date: Fri Jun  8 12:01:03 2012
New Revision: 3404

URL: http://svn.debian.org/wsvn/blends/?sc=1&rev=3404
Log:
Try to exclude some packages which seem to be removed and only some tags remained

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=3404&op=diff
==============================================================================
--- blends/trunk/machine_readable/fetch-machine-readable (original)
+++ blends/trunk/machine_readable/fetch-machine-readable Fri Jun  8 12:01:03 2012
@@ -65,35 +65,37 @@
       #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/$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$" -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
-          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
-                else
-                  if [ "$file" != "upstream" ] ; then
-                    echo "Did not found $file for package $pkg (`grep "$pkg" $TMPLIST | grep "$file"`)" >> $ERRLOG
+        if ! echo $vcslocation | grep -q tags ; then # sometimes some tags end up here but these seem to be packages removed from Debian
+          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/$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$" -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
+            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
+                  else
+                    if [ "$file" != "upstream" ] ; then
+                      echo "Did not found $file for package $pkg (`grep "$pkg" $TMPLIST | grep "$file"`)" >> $ERRLOG
+                    fi
                   fi
-            	fi
+                fi
               fi
-	    fi
-          fi
-        done
+            fi
+          done
+        fi
       else
         echo "Can not parse changelog for source name of $pkg" >> $ERRLOG
         mv changelog ${pkg}.broken.changelog