wesnoth_addon_manager: allow --html and --download to be used together

This commit is contained in:
Elias Pschernig 2008-10-09 19:32:18 +00:00
parent 16a9206301
commit cb9c3d2e43

View file

@ -152,16 +152,7 @@ if __name__ == "__main__":
version = info.get_or_create_sub("info").get_text_val("version", "")
return uploads, version
if options.html:
cs = CampaignClient(address)
data = cs.list_campaigns()
if data:
import addon_manager.html
addon_manager.html.output(options.html, options.url, data)
else:
sys.stderr.write("Could not connect.\n")
elif options.list:
if options.list:
cs = CampaignClient(address)
data = cs.list_campaigns()
if data:
@ -336,7 +327,18 @@ if __name__ == "__main__":
else:
sys.stdout.write(" - %s - is installed but not on server.\n" %
dirname)
elif options.html:
pass
else:
optionparser.print_help()
# This is independent, so a single call to the script can also do the
# HTML output.
if options.html:
cs = CampaignClient(address)
data = cs.list_campaigns()
if data:
import addon_manager.html
addon_manager.html.output(options.html, options.url, data)
else:
sys.stderr.write("Could not connect.\n")