widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/pretty-datadirs into lp:widelands.

Commit message:
Canonicalized datadir and datadir_for_testing in WLApplication.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/pretty-datadirs/+merge/285086

Because it confuses people to see /./ in a path.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/pretty-datadirs into lp:widelands.

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2016-01-31 18:50:37 +0000
+++ src/wlapplication.cc	2016-02-04 16:16:07 +0000
@@ -263,6 +263,8 @@
 
 	setup_homedir();
 	init_settings();
+	datadir_ = g_fs->canonicalize_name(datadir_);
+	datadir_for_testing_ = g_fs->canonicalize_name(datadir_for_testing_);
 
 	log("Adding directory: %s\n", datadir_.c_str());
 	g_fs->add_file_system(&FileSystem::create(datadir_));