From 0cddd44db923181cb2ba67e678d8d782449bb87f Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@google.com> Date: Mon, 3 May 2010 15:57:20 +0200 Subject: [PATCH] cfgupgrade: allow working with relative paths Since utils.WriteFile requires an absolute path, cfgupgrade needs to normalize the directory it is given. Signed-off-by: Iustin Pop <iustin@google.com> Reviewed-by: Guido Trotter <ultrotter@google.com> --- tools/cfgupgrade | 1 + tools/cfgupgrade12 | 1 + 2 files changed, 2 insertions(+) diff --git a/tools/cfgupgrade b/tools/cfgupgrade index 2143ba03b..5c95ede93 100755 --- a/tools/cfgupgrade +++ b/tools/cfgupgrade @@ -117,6 +117,7 @@ def main(): # We need to keep filenames locally because they might be renamed between # versions. + options.data_dir = os.path.abspath(options.data_dir) options.CONFIG_DATA_PATH = options.data_dir + "/config.data" options.SERVER_PEM_PATH = options.data_dir + "/server.pem" options.KNOWN_HOSTS_PATH = options.data_dir + "/known_hosts" diff --git a/tools/cfgupgrade12 b/tools/cfgupgrade12 index 2ebccce3e..7f649a79a 100755 --- a/tools/cfgupgrade12 +++ b/tools/cfgupgrade12 @@ -303,6 +303,7 @@ def main(): # We need to keep filenames locally because they might be renamed between # versions. + options.data_dir = os.path.abspath(options.data_dir) options.CONFIG_DATA_PATH = options.data_dir + "/config.data" options.SERVER_PEM_PATH = options.data_dir + "/server.pem" options.KNOWN_HOSTS_PATH = options.data_dir + "/known_hosts" -- GitLab