More work on apt-mirror.py