0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

addon_manager: simplify usage

Browse source 
To remove an add-on, you now have to use:
--remove ADD_ON PASSPHRASE
instead of:
--password 123 --remove NAME

Also, this commit fixes the badly
documented --password field.
It could previously be read as it can be applied
to any operation, not only removal.
But in fact it could only be used for removal.

Fixes GH-2445
This commit is contained in:
V N 2018-02-12 01:05:10 +03:00 • committed by Gunter Labes
parent 9c1a80043c
commit ae048467ed
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/tools/wesnoth_addon_manager
View file

@ -44,8 +44,6 @@ if __name__ == "__main__":
argumentparser.add_argument("-c", "--campaigns-dir",
help="directory where add-ons are stored",
default=".")
argumentparser.add_argument("-P", "--password",
help="password to use")
argumentparser.add_argument("-d", "--download",
help="download the named add-on; " +
"name may be a Python regexp matched against all add-on names " +
@ -73,9 +71,9 @@ if __name__ == "__main__":
argumentparser.add_argument("-V", "--verbose",
help="be even more verbose for everything",
action="store_true",)
argumentparser.add_argument("-r", "--remove",
help="remove the named add-on from the server, " +
"set the password -P")
argumentparser.add_argument("-r", "--remove", nargs=2,
metavar=("ADD-ON", "PASSPHRASE"),
help="remove the named add-on from the server")
argumentparser.add_argument("-R", "--raw-download",
action="store_true",
help="download as a binary WML packet")
@ -277,7 +275,7 @@ if __name__ == "__main__":
cs.unpackdir(decoded, args.campaigns_dir, verbose=True)
elif args.remove:
cs = CampaignClient(address)
data = cs.delete_campaign(args.remove, args.password)
data = cs.delete_campaign(*args.remove)
print_messages(data)
elif args.change_passphrase: