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

Fix broken campaigns-client upload.

Browse source
This commit is contained in:
Eric S. Raymond 2008-03-14 02:15:07 +00:00
parent 17c9e1e0ad
commit 985443c5f4
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/tools/wesnoth/campaignserver_client.py
View file

@ -316,7 +316,7 @@ class CampaignClient:
sub = put_dir(os.path.basename(fn), fn)
elif fn.endswith("~") or fn.endswith("-bak") or \
".pbl" in fn or ".exe" in fn or ".com" in fn or \
".bat" in fn or ".scr" in fn or ".sh":
".bat" in fn or ".scr" in fn or ".sh" in fn:
continue
else:
sub = put_file(os.path.basename(fn), file(fn))

8
utils/campaigns_client.py
View file

@ -44,7 +44,7 @@ if __name__ == "__main__":
"UPLOAD should be either the name of a campaign subdirectory," +
"(in which case the client looks for _server.pbl beneath it) " +
"or a path to the .pbl file (in which case the name of the " +
"campaign subdirectory is the basename of the path with .pbl removed)")
"campaign subdirectory is the name of the path with .pbl removed)")
optionparser.add_option("-s", "--status",
help = "Display the status of addons installed in the given " +
"directory.")
@ -201,11 +201,13 @@ if __name__ == "__main__":
print message.get_text_val("message")
elif options.upload:
cs = CampaignClient(address)
if os.path.isdir(os.path.join(options.campaigns_dir, options.upload)): # New style with _server.pbl
if os.path.isdir(os.path.join(options.campaigns_dir, options.upload)):
# New style with _server.pbl
pblfile = os.path.join(options.campaigns_dir, options.upload, "_server.pbl")
name = os.path.basename(options.upload)
wmldir = os.path.join(options.campaigns_dir, name)
else: # Old style with external .pbl file
else:
# Old style with external .pbl file
pblfile = options.upload
name = os.path.basename(options.upload)
name = os.path.splitext(name)[0]