[Blends-commit] [SCM] website branch, master, updated. 429f91c9d16a873f7e48e0b8c5b5cd71bc495320

Andreas Tille tille at debian.org
Sat Feb 6 12:59:19 UTC 2016


The following commit has been merged in the master branch:
commit 39e5fd1398566080ff74c95ed60b90ec9ef02fdb
Author: Andreas Tille <tille at debian.org>
Date:   Sat Feb 6 07:56:42 2016 +0100

    Fix gathering of edam files also for Git repositories

diff --git a/misc/machine_readable/fetch-machine-readable b/misc/machine_readable/fetch-machine-readable
index d9c4a0f..782e851 100755
--- a/misc/machine_readable/fetch-machine-readable
+++ b/misc/machine_readable/fetch-machine-readable
@@ -4,7 +4,7 @@
 #
 # TODO: store file <pkg>.vcs with the Vcs URL where the files were found
 
-TDNAME=machine-readable_with_edam
+TDNAME=machine-readable
 MACHINEREADABLEARCHIVE=/srv/home/groups/blends/htdocs/${TDNAME}/${TDNAME}.tar.bz2
 READMEDEBIANARCHIVE=/srv/home/groups/blends/htdocs/${TDNAME}/README.Debian.tar.bz2
 TARGETDIR=${HOME}/$TDNAME
@@ -193,7 +193,11 @@ git_checkout_machine_readable () {
       # for very strange reasons in two cases (pkg-games/pentobi.git and pkg-octave/octave.git) the line above contains strings not starting with ^debian ... enforcing this
       if echo $file | grep -q ^debian ; then
         destfile=${file%/metadata}
-        target=$TARGETDIR/$firstletter/${srcname}.`echo $destfile | sed 's?debian/??'`
+        if [ "$destfile" = "debian/upstream/edam" ] ; then
+          target=$TARGETDIR/$firstletter/${srcname}.edam
+        else
+          target=$TARGETDIR/$firstletter/${srcname}.`echo $destfile | sed 's?debian/??'`
+        fi
         if echo $file | grep -q README.Debian ; then
           rdfile=`basename $file`
           if [ "$rdfile" = "README.Debian" ] ; then

-- 
Static and dynamic websites for Debian Pure Blends



More information about the Blends-commit mailing list