Author: elias
Date: Thu Oct 9 21:32:18 2008
New Revision: 29984
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29984&view=rev
Log:
wesnoth_addon_manager: allow --html and --download to be used together
Modified:
trunk/data/tools/wesnoth_addon_manager
Modified: trunk/data/tools/wesnoth_addon_manager
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wesnoth_addon_manager?rev=29984&r1=29983&r2=29984&view=diff
==============================================================================
--- trunk/data/tools/wesnoth_addon_manager (original)
+++ trunk/data/tools/wesnoth_addon_manager Thu Oct 9 21:32:18 2008
@@ -152,16 +152,7 @@
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 @@
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")
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
