[aur-dev] [PATCH 1/2] git-update: Only check HEAD for blacklisted packages

[Lukas Fleischer]

When a part of a package base is moved to the official repositories, it
needs to be dropped from the AUR package. However, we want to allow that
the moved packages still appear in the history.

Signed-off-by: Lukas Fleischer <lfleischer at archlinux.org>
---
 git-interface/git-update.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/git-interface/git-update.py b/git-interface/git-update.py
index c4f9da7..34633e8 100755
--- a/git-interface/git-update.py
+++ b/git-interface/git-update.py
@@ -225,10 +225,6 @@ for commit in walker:
             die_commit('invalid package name: %s' % (pkginfo['pkgname']),
                        commit.id)
 
-        if pkginfo['pkgname'] in blacklist:
-            die_commit('package is blacklisted: %s' % (pkginfo['pkgname']),
-                       commit.id)
-
         if not re.match(r'(?:http|ftp)s?://.*', pkginfo['url']):
             die_commit('invalid URL: %s' % (pkginfo['url']), commit.id)
 
@@ -256,6 +252,12 @@ srcinfo_pkgbase = srcinfo._pkgbase['pkgname']
 if srcinfo_pkgbase != pkgbase:
     die('invalid pkgbase: %s' % (srcinfo_pkgbase))
 
+for pkgname in srcinfo.GetPackageNames():
+    pkginfo = srcinfo.GetMergedPackage(pkgname)
+
+    if pkginfo['pkgname'] in blacklist:
+        die('package is blacklisted: %s' % (pkginfo['pkgname']))
+
 save_srcinfo(srcinfo, db, cur, user)
 
 db.close()
-- 
2.4.2