Commit 62c13e2c authored by Lukas Fleischer's avatar Lukas Fleischer
Browse files

Do not show ".SRCINFO unchanged" warning on restore

Since 612300b3

 (Show a warning if .SRCINFO is unchanged, 2015-09-29), the
git-update script displays a warning when a ref update does not affect
the content of the package base meta data. We also invoke git-update to
rebuild the package base details in the aurweb database when a package
base is restored via the SSH interface. In that case, fake information
is passed to the update hook: Both the old and the new object IDs refer
to the current HEAD. Check for such "Everything up-to-date" updates and
not display the ".SRCINFO unchanged" in these cases.

Signed-off-by: Lukas Fleischer's avatarLukas Fleischer <lfleischer@archlinux.org>
parent 4fe513d8
......@@ -286,7 +286,7 @@ for commit in walker:
die_commit('missing source file: {:s}'.format(fname), str(commit.id))
# Display a warning if .SRCINFO is unchanged.
if sha1_old != "0000000000000000000000000000000000000000":
if sha1_old not in ("0000000000000000000000000000000000000000", sha1_new):
srcinfo_id_old = repo[sha1_old].tree['.SRCINFO'].id
srcinfo_id_new = repo[sha1_new].tree['.SRCINFO'].id
if srcinfo_id_old == srcinfo_id_new:
......
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