Commit e3bcf83f authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

git-update: Do not overwrite the repo variable

The repo variable is already used to store the pygit2.Repository.

Fixes a regression introduced in d273ee5e

 (Use the official provider list
to detect duplicates, 2016-05-17).
Signed-off-by: Lukas Fleischer's avatarLukas Fleischer <lfleischer@archlinux.org>
parent 29625e07
......@@ -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])
......
......@@ -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 &&
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment