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>
This commit is contained in:
Lukas Fleischer 2015-06-04 11:08:16 +02:00
parent 18292e7114
commit c4870a95fc

View file

@ -225,10 +225,6 @@ for commit in walker:
die_commit('invalid package name: %s' % (pkginfo['pkgname']), die_commit('invalid package name: %s' % (pkginfo['pkgname']),
commit.id) 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']): if not re.match(r'(?:http|ftp)s?://.*', pkginfo['url']):
die_commit('invalid URL: %s' % (pkginfo['url']), commit.id) die_commit('invalid URL: %s' % (pkginfo['url']), commit.id)
@ -256,6 +252,12 @@ srcinfo_pkgbase = srcinfo._pkgbase['pkgname']
if srcinfo_pkgbase != pkgbase: if srcinfo_pkgbase != pkgbase:
die('invalid pkgbase: %s' % (srcinfo_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) save_srcinfo(srcinfo, db, cur, user)
db.close() db.close()