summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <lfleischer@archlinux.org>2016-08-22 08:16:47 +0200
committerLukas Fleischer <lfleischer@archlinux.org>2016-08-22 08:25:51 +0200
commite3bcf83feb2dd68352c6c47aa16d64c025e1fb5b (patch)
tree1c40778ff3950d776d97992ee6ac3dd0af71def0
parent29625e074472b6546e7433e9b72a3b907abd06ff (diff)
downloadaur-e3bcf83feb2dd68352c6c47aa16d64c025e1fb5b.tar.gz
aur-e3bcf83feb2dd68352c6c47aa16d64c025e1fb5b.tar.xz
git-update: Do not overwrite the repo variable
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 <lfleischer@archlinux.org>
-rwxr-xr-xgit-interface/git-update.py3
-rwxr-xr-xgit-interface/test/t0003-update.sh2
2 files changed, 2 insertions, 3 deletions
diff --git a/git-interface/git-update.py b/git-interface/git-update.py
index 50938c3c..be4c9be9 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 4a457793..b642089c 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 &&