summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 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()