The new code will silently ignore MASTER_SITE_GOOGLE_CODE and
MASTER_SITE_DEBIAN_POOL unless specifically asked to sort them, in which
case an error message is printed.
Most of the patch came from Ryan Steinmetz <rpsfa@rit.edu> with small
additions by me.