The repo variable is already used to store the pygit2.Repository.
Fixes a regression introduced in d273ee5 (Use the official provider list
to detect duplicates, 2016-05-17).
Signed-off-by: Lukas Fleischer
---
git-interface/git-update.py | 3 +--
git-interface/test/t0003-update.sh | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/git-interface/git-update.py b/git-interface/git-update.py
index 50938c3..be4c9be 100755
--- a/git-interface/git-update.py
+++ b/git-interface/git-update.py
@@ -373,8 +373,7 @@ for pkgname in srcinfo.utils.get_package_names(metadata):
if pkgname in blacklist:
warn_or_die('package is blacklisted: {:s}'.format(pkgname))
if pkgname in providers:
- repo = providers[pkgname]
- warn_or_die('package already provided by [{:s}]: {:s}'.format(repo, pkgname))
+ warn_or_die('package already provided by [{:s}]: {:s}'.format(providers[pkgname], pkgname))
cur = conn.execute("SELECT COUNT(*) FROM Packages WHERE Name = ? AND " +
"PackageBaseID <> ?", [pkgname, pkgbase_id])
diff --git a/git-interface/test/t0003-update.sh b/git-interface/test/t0003-update.sh
index 4a45779..b642089 100755
--- a/git-interface/test/t0003-update.sh
+++ b/git-interface/test/t0003-update.sh
@@ -396,7 +396,7 @@ test_expect_success 'Pushing a package already in the official repositories.' '
test_cmp expected actual
'
-test_expect_failure 'Pushing a package already in the official repositories as Trusted User.' '
+test_expect_success 'Pushing a package already in the official repositories as Trusted User.' '
old=$(git -C aur.git rev-parse HEAD) &&
test_when_finished "git -C aur.git reset --hard $old" &&
echo "pkgname = official" >>aur.git/.SRCINFO &&
--
2.9.3