From 513921c01c4212cbb42197038393a6998e64830a Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Mon, 31 Mar 2008 11:17:00 +0000 Subject: [PATCH] Define a function for popping to the top-level dist directory. --- data/tools/wesnoth/wmltools.py | 14 ++++++++++++++ data/tools/wmlmove | 13 +------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/data/tools/wesnoth/wmltools.py b/data/tools/wesnoth/wmltools.py index 02035f63ff5..d2c36c4ace8 100644 --- a/data/tools/wesnoth/wmltools.py +++ b/data/tools/wesnoth/wmltools.py @@ -8,6 +8,20 @@ import sys, os, re, sre_constants, md5, glob resource_extensions = ("png", "jpg", "ogg", "wav", "map", "mask") image_reference = r"[A-Za-z0-9{}.][A-Za-z0-9_/+{}.-]*\.(png|jpg)(?=(~.*)?)" +def pop_to_top(whoami): + "Pop upward to the top-level directory." + upwards = os.getcwd().split(os.sep) + upwards.reverse() + for pathpart in upwards: + if pathpart == "wesnoth": + break + else: + os.chdir("..") + else: + sys.stderr.write(whoami + ": must be run from within a Battle " + "for Wesnoth source tree.\n") + sys.exit(1) + def string_strip(value): "String-strip the value" if value.startswith('"'): diff --git a/data/tools/wmlmove b/data/tools/wmlmove index e2268caa91e..c214d0f31e9 100755 --- a/data/tools/wmlmove +++ b/data/tools/wmlmove @@ -96,18 +96,7 @@ if __name__ == "__main__": else: dst = arguments.pop() - # First, pop upward to the top-level directory. - upwards = os.getcwd().split(os.sep) - upwards.reverse() - for pathpart in upwards: - if pathpart == "wesnoth": - break - else: - os.chdir("..") - else: - sys.stderr.write("wmlmove: must be run from within a Battle " - "for Wesnoth source tree.\n") - sys.exit(1) + pop_to_top("wmlmove") if listspaces: print "\n".join(map(os.path.basename, scopelist()))