[aur-dev] [PATCH 1/4] git-update: Move blacklist reading further down
Lukas Fleischer
lfleischer at archlinux.org
Sun Aug 16 04:50:23 UTC 2015
Since c4870a9 (git-update: Only check HEAD for blacklisted packages,
2015-06-04), only the HEAD commit package name is looked up in the
blacklist. This means that we no longer need to read the blacklist
before running the commit walker. Moving the blacklist reading code
further down makes the code easier to read.
Signed-off-by: Lukas Fleischer <lfleischer at archlinux.org>
---
git-interface/git-update.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-interface/git-update.py b/git-interface/git-update.py
index 935fa5b..de6ceb4 100755
--- a/git-interface/git-update.py
+++ b/git-interface/git-update.py
@@ -212,9 +212,6 @@ walker = repo.walk(sha1_new, pygit2.GIT_SORT_TOPOLOGICAL)
if sha1_old != "0000000000000000000000000000000000000000":
walker.hide(sha1_old)
-cur.execute("SELECT Name FROM PackageBlacklist")
-blacklist = [row[0] for row in cur.fetchall()]
-
for commit in walker:
for fname in ('.SRCINFO', 'PKGBUILD'):
if not fname in commit.tree:
@@ -293,6 +290,9 @@ pkgbase = srcinfo._pkgbase['pkgname']
cur.execute("SELECT ID FROM PackageBases WHERE Name = %s", [pkgbase])
pkgbase_id = cur.fetchone()[0]
+cur.execute("SELECT Name FROM PackageBlacklist")
+blacklist = [row[0] for row in cur.fetchall()]
+
for pkgname in srcinfo.GetPackageNames():
pkginfo = srcinfo.GetMergedPackage(pkgname)
pkgname = pkginfo['pkgname']
--
2.5.0
More information about the aur-dev
mailing list