[Blends-commit] [SCM] website branch, master, updated. 8e732d8a3e3ad7d61a004902ddc4ec585023d673

[Andreas Tille]

The following commit has been merged in the master branch:
commit 8e732d8a3e3ad7d61a004902ddc4ec585023d673
Author: Andreas Tille <tille at debian.org>
Date:   Sun Mar 2 09:12:12 2014 +0100

    It seems more save to not drop the /svn dir ... at least the announced form to specify SVN urls stopped working at 27.2.2014

diff --git a/misc/machine_readable/fetch-machine-readable b/misc/machine_readable/fetch-machine-readable
index 09596b6..4e3f140 100755
--- a/misc/machine_readable/fetch-machine-readable
+++ b/misc/machine_readable/fetch-machine-readable
@@ -42,7 +42,7 @@ svn_checkout_machine_readable () {
   curdir=`pwd`
   cd $TARGETDIR
   TMPLIST=`mktemp`
-  svn list --verbose svn://localhost/$1 --recursive | \
+  svn list --verbose svn://localhost/svn/$1 --recursive | \
     grep -v -e '/tags/' -e '/branches/' -e '/patches/' | \
     grep -e "/control$" -e "/changelog$" -e "/copyright$" -e "/upstream$" -e "/upstream/metadata$" | \
     grep -v "tests/control" | \
@@ -67,7 +67,7 @@ svn_checkout_machine_readable () {
     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 "^[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
+      svn export svn://localhost/svn/$1/$chlog >/dev/null
       srcname=`dpkg-parsechangelog -lchangelog 2>/dev/null | sed -n 's/^Source: //p'`
       ## DEBUG
       #echo "$pkgdir -> $pkg ($chlog) -> $srcname"
@@ -97,7 +97,7 @@ svn_checkout_machine_readable () {
                 fi
             fi
             if [ "" != "$getfile" ] ; then
-              svn export svn://localhost/$1/$getfile >/dev/null 2>/dev/null
+              svn export svn://localhost/svn/$1/$getfile >/dev/null 2>/dev/null
               if [ -e $srcfile ] ; then
                 mv $srcfile $TARGETDIR/$firstletter/${srcname}.$destfile
               else
@@ -109,7 +109,7 @@ svn_checkout_machine_readable () {
                   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` || true
                   if [ "" != "$getfile" ] ; then
-                    svn export svn://localhost/$1/$getfile >/dev/null 2>/dev/null
+                    svn export svn://localhost/svn/$1/$getfile >/dev/null 2>/dev/null
                     if [ -e $srcfile ] ; then
                       mv $srcfile $TARGETDIR/$firstletter/${srcname}.$destfile
                     else

-- 
Static and dynamic websites for Debian Pure Blends