From d0be66015ab86ecdc34025bb870e8e4d5897ceec Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Sat, 27 Jun 2015 11:58:17 +0200 Subject: git-update: Improve error message on invalid pkgbase When the package base does not match the repository name, we currently show an error message that only mentions the package base name: error: invalid pkgbase: yate-qt4 To the end user this sounds like the package base name is malformed itself (and we show exactly the same error message when it contains invalid characters, indeed). Clarify that there is a name mismatch by also printing the expected value: error: invalid pkgbase: yate-qt4, expected: yate4-qt Inspired by FS#45483. Signed-off-by: Lukas Fleischer --- git-interface/git-update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index 3987087..592f127 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -286,7 +286,7 @@ srcinfo = aurinfo.ParseAurinfoFromIterable(srcinfo_raw) srcinfo_pkgbase = srcinfo._pkgbase['pkgname'] if srcinfo_pkgbase != pkgbase: - die('invalid pkgbase: {:s}'.format(srcinfo_pkgbase)) + die('invalid pkgbase: {:s}, expected {:s}'.format(srcinfo_pkgbase, pkgbase)) pkgbase = srcinfo._pkgbase['pkgname'] cur.execute("SELECT ID FROM PackageBases WHERE Name = %s", [pkgbase]) -- cgit v1.2.3-54-g00ecf