somehow the correct md5sum couldn't make it in the last commit

/reviewed-on nexedi/slapos!173

software/slaprunner/buildout.hash.cfg

@@ -27,7 +27,7 @@ md5sum = feee1dc29d160e0d796dab0ba767745f
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in
-md5sum = 979dc9c4e901428a1d7f1328851c4513
+md5sum = 70931f214b3f7c3992e29c150a30d3cf
 
 [template-runner-export-script]
 filename = template/runner-export.sh.jinja2

[Vincent Pelletier]

Did this happen after rebasing and you expected update-hash commit hook to fix the checksum ?

Normally, you should get a conflict anyway, in which case I typically:

• reset the buildout.hash.cfg file (the revision you choose to reset to only matters if entries were added/removed)
• git commit (required as git rebase --continue will also not run the commit hook)
• git rebase --continue

(repeat for each conflicting commit)

Likewise, when editing commits during a rebase, you cannot rely on git rebase --continue to edit your commits, you have to explicitely commit along the way.

[Hardik Juneja]

Hello,

I usually manually edit during the conflict but I will try to use the above workflow next time. I recently found out that the update-hash commit hook actually don't work for some software releases : software/powerdns and software/kvm are two examples, so I had to manually do it for them, I think the reason is that the hashes are not inside buildoutl.cfg but in software.cfg and common.cfg respectively. But I have to look deeper in the code to see if it is the real problem

[Vincent Pelletier]

I recently found out that the update-hash commit hook actually don't work for some software releases : software/powerdns and software/kvm are two examples

update-hash only works on buildout.hash.cfg, it does not edit files it does not know. The whole puprpose of buildout.hash.cfg, as stated in contained comment, it to contain only a minimal subset of buildout syntax so update-hash can safely rewrite it without destroying someone's change. As these SRs were not prepared for it, update-hash does not touch these.

Also, buildout.hash.cfg should only be created when one has update-hash hook enabled, or they will likely introduce a mistake which will annoy everybody with the hook enabled. It would be nice for update-hash to only try to update buildout.hash.cfg which do reference one of the files modified in any given commit, to reduce the annoyance spread. But the hope anyway is that update-hash will help everyone, so that everyone will eventually enable it...

[Hardik Juneja]

Thanks for the explanation, this makes sense to me. Hopefully things would be better when everyone will enable it :)