[sysadmin-bin] This should be it.



commit 1c882732651061f9bdf0cd1d1a5feec3a295c995
Author: Andrea Veri <av gnome org>
Date:   Mon Jul 29 16:55:47 2013 +0200

    This should be it.

 git/post-receive-github |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/git/post-receive-github b/git/post-receive-github
index 2a1bf21..abae517 100755
--- a/git/post-receive-github
+++ b/git/post-receive-github
@@ -112,22 +112,18 @@ def get_repo_settings (name):
 
     resource = '{%s}resource' % nss['rdf']
 
-    repo = prj.find('doap:repository/doap:GitRepository/doap:location', nss)
-    name = prj.find ('doap:name', nss)
-    desc = prj.find('doap:shortdesc', nss)
-    homepage = prj.find('doap:homepage/[ rdf:resource]', nss)
-    category = prj.find('doap:category/[ rdf:resource]', nss)
+    name = prj.find ('{%s}name' % nss["doap"])
+    desc = prj.find('{%s}shortdesc' % nss["doap"])
+    homepage = prj.find('{%s}homepage' % nss["doap"])
 
-    repo = repo.get(resource) if repo else "git://git.gnome.org/%s" % name
     name = name.text if name != None else repo.split('/')[-1]
     desc = desc.text if desc != None else name
+
     homepage = homepage.get(resource) if homepage != None else 'http://www.gnome.org/'
-    category = category.get(resource) if category != None else 'gnome'
+    homepage = homepage if homepage != None else 'http://www.gnome.org/'
 
-    return { "category":    category.encode('utf-8').decode('utf-8'),
-             "homepage":    homepage.encode('utf-8').decode('utf-8'),
+    return { "homepage":    homepage.encode('utf-8').decode('utf-8'),
              "name":        name.encode('utf-8').decode('utf-8'),
-             "repository":  repo.encode('utf-8').decode('utf-8'),
              "description": desc.encode('utf-8').decode('utf-8')}
 
 def main ():
@@ -150,7 +146,6 @@ def main ():
         raise Exception("Error trying to push branch %s\nSTDOUT:\n%s\nSTDERR\n%s" % (repo_name, out.read(), 
err.read()))
 
 if __name__ == "__main__":
-    main()
     try:
         main ()
     except Exception as e:


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