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>

diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 2143ba0..5c95ede 100755 (executable)
--- 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 2ebccce..7f649a7 100755 (executable)
--- 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"