diff options
| author | Lukas Fleischer <lfleischer@archlinux.org> | 2015-10-03 12:02:43 +0200 |
|---|---|---|
| committer | Lukas Fleischer <lfleischer@archlinux.org> | 2015-10-03 12:10:25 +0200 |
| commit | 62c13e2c0c55dfee703245b3a210f8d0e2eb5c5e (patch) | |
| tree | 87becc9ab956e0c9df930d28cdc550c2fbaf3f53 | |
| parent | 4fe513d838373575cf173fafbd0bc6e7ce30090a (diff) | |
| download | aur-62c13e2c0c55dfee703245b3a210f8d0e2eb5c5e.tar.gz aur-62c13e2c0c55dfee703245b3a210f8d0e2eb5c5e.tar.xz | |
Do not show ".SRCINFO unchanged" warning on restore
Since 612300b (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 <lfleischer@archlinux.org>
| -rwxr-xr-x | git-interface/git-update.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-interface/git-update.py b/git-interface/git-update.py index b4185251..6e09517f 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -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: |