[sysadmin-bin] remove support for MAINTAINERS file



commit c5048864a7a91af0bbda6444608c8d6236bdca8c
Author: Olav Vitters <olav vitters nl>
Date:   Sun Aug 3 00:33:53 2014 +0200

    remove support for MAINTAINERS file

 git/doap-from-maintainers           |   58 -----------------------------------
 git/post-receive-update-description |   17 +---------
 git/pre-receive-check-maintainers   |    8 ++---
 git/update-all-info                 |    2 -
 4 files changed, 4 insertions(+), 81 deletions(-)
---
diff --git a/git/post-receive-update-description b/git/post-receive-update-description
index 230d1dd..99aa17b 100755
--- a/git/post-receive-update-description
+++ b/git/post-receive-update-description
@@ -25,19 +25,6 @@ update_info_from_doap() {
     /usr/bin/fishpoke clipboard-back doap_rebuild
 }
 
-update_info_from_maintainers() {
-    rev=$1
-    path=$2
-    mode=$3
-
-    if [ "$path" != "MAINTAINERS" ] ; then
-        return
-    fi
-
-    git cat-file blob "$newrev:$path" | $BINDIR/doap-from-maintainers > $GIT_DIR/gnome_doap
-    $BINDIR/update-cgit
-}
-
 update_info() {
     oldrev=$1
     newrev=$2
@@ -59,12 +46,10 @@ update_info() {
        return 0
     fi
 
-    # If there is no .doap file, we fall back to the MAINTAINERS
-    # file for compability
     if git cat-file -e $newrev:$projectshort.doap 2>/dev/null ; then
        update=update_info_from_doap
     else
-       update=update_info_from_maintainers
+       return 1
     fi
 
     if expr $oldrev : "^0\+$" > /dev/null 2>&1; then
diff --git a/git/pre-receive-check-maintainers b/git/pre-receive-check-maintainers
index a197154..8ff8194 100755
--- a/git/pre-receive-check-maintainers
+++ b/git/pre-receive-check-maintainers
@@ -1,10 +1,8 @@
 #!/bin/bash
 
 # This checks to see if the module has maintainer information. Maintainer
-# information can be provided one of two ways:
-#
-#  - A <modulename>.doap file
-#  - A MAINTAINERS file (deprecated)
+# information MUST be provided using the following file:
+#   <modulename>.doap
 
 BINDIR=/home/admin/bin/git
 
@@ -55,7 +53,7 @@ check_maintainers() {
            fi
        fi
     else
-        echo "A valid $projectshort.doap file is required. See 
https://wiki.gnome.org/MaintainersCorner#maintainers"; >&2
+        echo "A valid $projectshort.doap file is required. See https://wiki.gnome.org/Git/FAQ"; >&2
         return 1
     fi
 }
diff --git a/git/update-all-info b/git/update-all-info
index 4d6ad2b..39f74da 100755
--- a/git/update-all-info
+++ b/git/update-all-info
@@ -16,8 +16,6 @@ function process_repos() {
                export GIT_DIR=$r
                if git cat-file -e master:$projectshort.doap 2>/dev/null ; then
                    git cat-file blob master:$projectshort.doap | $BINDIR/extract-doap-info $r
-               elif git cat-file -e master:MAINTAINERS 2>/dev/null ; then
-                   git cat-file blob master:MAINTAINERS | $BINDIR/doap-from-maintainers > $r/gnome_doap
                fi
            fi
        done


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]