makebuildserver: set debian mirror in config file only

Setting it in the config file was not working, and right now, all of the
options are in the config file and not as command line flags, so remove
--debian-mirror to keep that consistent.
This commit is contained in:
Hans-Christoph Steiner 2016-01-22 14:33:17 +01:00
parent 82e26cf59e
commit 8d66742dd7

View file

@ -41,8 +41,6 @@ parser.add_option("-v", "--verbose", action="store_true", default=False,
help="Spew out even more information than normal") help="Spew out even more information than normal")
parser.add_option("-c", "--clean", action="store_true", default=False, parser.add_option("-c", "--clean", action="store_true", default=False,
help="Build from scratch, rather than attempting to update the existing server") help="Build from scratch, rather than attempting to update the existing server")
parser.add_option("--debian-mirror", default="http://http.debian.net/debian/",
help="Use the specified Debian mirror in the box's /etc/apt/sources.list.")
options, args = parser.parse_args() options, args = parser.parse_args()
# set up default config # set up default config
@ -383,7 +381,7 @@ vagrantfile += """
chef.add_recipe "kivy" chef.add_recipe "kivy"
end end
end end
""" % (options.debian_mirror) """ % (config['debian_mirror'])
# Check against the existing Vagrantfile, and if they differ, we need to # Check against the existing Vagrantfile, and if they differ, we need to
# create a new box: # create a new box: