summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@archlinux.org>2015-06-04 11:08:16 +0200
committerLukas Fleischer <lfleischer@archlinux.org>2015-06-04 11:25:01 +0200
commitc4870a95fc54e7ca12c495fd63932a35418b9c83 (patch)
tree97cf44df449eb02529e64662c52c5e64aceaafee
parent18292e71143fefec22f981356e7a79f208ae68dc (diff)
downloadaur-c4870a95fc54e7ca12c495fd63932a35418b9c83.tar.gz
aur-c4870a95fc54e7ca12c495fd63932a35418b9c83.tar.xz
git-update: Only check HEAD for blacklisted packages
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@archlinux.org>
-rwxr-xr-xgit-interface/git-update.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/git-interface/git-update.py b/git-interface/git-update.py
index c4f9da7a..34633e89 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()