Fix -y and ASSUME_ALWAYS_YES in pkg annotate

This is related to the test fixing in #957.