Do not load local settings project deps on init.

egorpugin · egorpugin · commit f964cb1d730e · 2017-02-25T00:27:24.000+03:00
diff --git a/src/client/main.cpp b/src/client/main.cpp
@@ -512,9 +512,9 @@ void load_current_config()
     {
         // load local settings for storage dir
         Config c;
-        c.allow_relative_project_names = true;
-        c.allow_local_dependencies = true;
-        c.load_current_config();
+        //c.allow_relative_project_names = true;
+        //c.allow_local_dependencies = true;
+        c.load_current_config_settings();
     }
     catch (...)
     {
diff --git a/src/common/config.cpp b/src/common/config.cpp
@@ -78,6 +78,14 @@ void Config::load_current_config()
         addDefaultProject();
 }
 
+void Config::load_current_config_settings()
+{
+    if (!fs::exists(dir / CPPAN_FILENAME))
+        return addDefaultProject();
+    auto root = load_yaml_config(dir / CPPAN_FILENAME);
+    load_settings(root, false);
+}
+
 void Config::load(const path &p)
 {
     auto root = load_yaml_config(p);
@@ -90,22 +98,40 @@ void Config::load(const String &s)
     load(root);
 }
 
-void Config::load(const yaml &root)
+void Config::load_settings(const yaml &root, bool load_project)
 {
-    if (root.IsNull() || !root.IsMap())
-    {
-        addDefaultProject();
-        LOG_DEBUG(logger, "Spec file should be a map");
+    if (!check_config_root(root))
         return;
-    }
 
     auto ls = root["local_settings"];
     if (ls.IsDefined())
     {
         if (!ls.IsMap())
             throw std::runtime_error("'local_settings' should be a map");
-        Settings::get_local_settings().load(root["local_settings"], SettingsType::Local);
+        auto &ls = Settings::get_local_settings();
+        ls.load_project = load_project;
+        ls.load(root["local_settings"], SettingsType::Local);
+        ls.load_project = true;
     }
+}
+
+bool Config::check_config_root(const yaml &root)
+{
+    if (root.IsNull() || !root.IsMap())
+    {
+        addDefaultProject();
+        LOG_DEBUG(logger, "Spec file should be a map");
+        return false;
+    }
+    return true;
+}
+
+void Config::load(const yaml &root)
+{
+    if (!check_config_root(root))
+        return;
+
+    load_settings(root);
 
     ProjectPath root_project;
     EXTRACT(root_project, String);
diff --git a/src/common/config.h b/src/common/config.h
@@ -39,6 +39,7 @@ struct Config
     void reload(const path &p);
 
     void load_current_config();
+    void load_current_config_settings();
 
     void process(const path &p = path()) const;
     void post_download() const;
@@ -66,6 +67,9 @@ struct Config
     void addDefaultProject();
     Project &getProject1(const ProjectPath &ppath);
 
+    bool check_config_root(const yaml &root);
+    void load_settings(const yaml &root, bool load_project = true);
+
 public:
     bool defaults_allowed = true;
     bool allow_relative_project_names = false;
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
@@ -201,7 +201,7 @@ void Settings::load_main(const yaml &root, const SettingsType type)
     }
 
     // read project settings (deps etc.)
-    if (type == SettingsType::Local)
+    if (type == SettingsType::Local && load_project)
     {
         Project p;
         p.allow_relative_project_names = true;
diff --git a/src/common/settings.h b/src/common/settings.h
@@ -128,6 +128,7 @@ struct Settings
 
     // not for loading from config
     bool generate_only = false;
+    bool load_project = true;
 
 public:
     Settings();

Original file line number	Diff line number	Diff line change
`@@ -512,9 +512,9 @@ void load_current_config()`
`512`	`512`	`{`
`513`	`513`	`// load local settings for storage dir`
`514`	`514`	`Config c;`
`515`		`- c.allow_relative_project_names = true;`
`516`		`- c.allow_local_dependencies = true;`
`517`		`- c.load_current_config();`
	`515`	`+ //c.allow_relative_project_names = true;`
	`516`	`+ //c.allow_local_dependencies = true;`
	`517`	`+ c.load_current_config_settings();`
`518`	`518`	`}`
`519`	`519`	`catch (...)`
`520`	`520`	`{`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ void Settings::load_main(const yaml &root, const SettingsType type)`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`// read project settings (deps etc.)`
`204`		`- if (type == SettingsType::Local)`
	`204`	`+ if (type == SettingsType::Local && load_project)`
`205`	`205`	`{`
`206`	`206`	`Project p;`
`207`	`207`	`p.allow_relative_project_names = true;`