Manually skip empty package.

egorpugin · egorpugin · commit c4ce453a01ef · 2017-10-24T00:10:54.000+03:00
diff --git a/src/common/package_store.cpp b/src/common/package_store.cpp
@@ -132,6 +132,8 @@ void PackageStore::process(const path &p, Config &root)
     // add more necessary actions here
     for (auto &cc : *this)
     {
+        if (cc.first == Package())
+            continue;
         root.getDefaultProject().checks += cc.second.config->getDefaultProject().checks;
     }
 
@@ -141,6 +143,8 @@ void PackageStore::process(const path &p, Config &root)
     // do not multithread this! causes livelocks
     for (auto &cc : *this)
     {
+        if (cc.first == Package())
+            continue;
         auto &d = cc.first;
 
         auto printer = Printer::create(Settings::get_local_settings().printerType);
@@ -218,6 +222,8 @@ void PackageStore::check_deps_changed()
     std::unordered_map<Package, String> clean_pkgs;
     for (auto &cc : *this)
     {
+        if (cc.first == Package())
+            continue;
         // make sure we have ordered deps
         Hasher h;
         StringSet deps;
@@ -256,41 +262,21 @@ void PackageStore::check_deps_changed()
 
 PackageStore::iterator PackageStore::begin()
 {
-    auto i = packages.find(Package());
-    if (i == packages.begin())
-        return ++i;
     return packages.begin();
 }
 
 PackageStore::iterator PackageStore::end()
 {
-    auto i = packages.find(Package());
-    if (i != packages.end())
-    {
-        if (i == --packages.end())
-            return i;
-        throw std::logic_error("Oops! Empty package not at the end of packages");
-    }
     return packages.end();
 }
 
 PackageStore::const_iterator PackageStore::begin() const
 {
-    auto i = packages.find(Package());
-    if (i == packages.begin())
-        return ++i;
     return packages.begin();
 }
 
 PackageStore::const_iterator PackageStore::end() const
 {
-    auto i = packages.find(Package());
-    if (i != packages.end())
-    {
-        if (i == --packages.end())
-            return i;
-        throw std::logic_error("Oops! Empty package not at the end of packages");
-    }
     return packages.end();
 }
 
@@ -318,6 +304,8 @@ void PackageStore::write_index() const
     auto &sdb = getServiceDatabase();
     for (auto &cc : *this)
     {
+        if (cc.first == Package())
+            continue;
         sdb.addInstalledPackage(cc.first);
 #ifdef _WIN32
         create_link(cc.first.getDirSrc(), directories.storage_dir_lnk / "src" / (cc.first.target_name + ".lnk"));
diff --git a/src/common/resolver.cpp b/src/common/resolver.cpp
@@ -378,7 +378,11 @@ void Resolver::download_and_unpack()
 void Resolver::post_download()
 {
     for (auto &cc : rd)
+    {
+        if (cc.first == Package())
+            continue;
         prepare_config(cc);
+    }
 }
 
 void Resolver::prepare_config(PackageStore::PackageConfigs::value_type &cc)

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,8 @@ void PackageStore::process(const path &p, Config &root)`
`132`	`132`	`// add more necessary actions here`
`133`	`133`	`for (auto &cc : *this)`
`134`	`134`	`{`
	`135`	`+ if (cc.first == Package())`
	`136`	`+ continue;`
`135`	`137`	`root.getDefaultProject().checks += cc.second.config->getDefaultProject().checks;`
`136`	`138`	`}`
`137`	`139`
`@@ -141,6 +143,8 @@ void PackageStore::process(const path &p, Config &root)`
`141`	`143`	`// do not multithread this! causes livelocks`
`142`	`144`	`for (auto &cc : *this)`
`143`	`145`	`{`
	`146`	`+ if (cc.first == Package())`
	`147`	`+ continue;`
`144`	`148`	`auto &d = cc.first;`
`145`	`149`
`146`	`150`	`auto printer = Printer::create(Settings::get_local_settings().printerType);`
`@@ -218,6 +222,8 @@ void PackageStore::check_deps_changed()`
`218`	`222`	`std::unordered_map<Package, String> clean_pkgs;`
`219`	`223`	`for (auto &cc : *this)`
`220`	`224`	`{`
	`225`	`+ if (cc.first == Package())`
	`226`	`+ continue;`
`221`	`227`	`// make sure we have ordered deps`
`222`	`228`	`Hasher h;`
`223`	`229`	`StringSet deps;`
`@@ -256,41 +262,21 @@ void PackageStore::check_deps_changed()`
`256`	`262`
`257`	`263`	`PackageStore::iterator PackageStore::begin()`
`258`	`264`	`{`
`259`		`- auto i = packages.find(Package());`
`260`		`- if (i == packages.begin())`
`261`		`- return ++i;`
`262`	`265`	`return packages.begin();`
`263`	`266`	`}`
`264`	`267`
`265`	`268`	`PackageStore::iterator PackageStore::end()`
`266`	`269`	`{`
`267`		`- auto i = packages.find(Package());`
`268`		`- if (i != packages.end())`
`269`		`- {`
`270`		`- if (i == --packages.end())`
`271`		`- return i;`
`272`		`- throw std::logic_error("Oops! Empty package not at the end of packages");`
`273`		`- }`
`274`	`270`	`return packages.end();`
`275`	`271`	`}`
`276`	`272`
`277`	`273`	`PackageStore::const_iterator PackageStore::begin() const`
`278`	`274`	`{`
`279`		`- auto i = packages.find(Package());`
`280`		`- if (i == packages.begin())`
`281`		`- return ++i;`
`282`	`275`	`return packages.begin();`
`283`	`276`	`}`
`284`	`277`
`285`	`278`	`PackageStore::const_iterator PackageStore::end() const`
`286`	`279`	`{`
`287`		`- auto i = packages.find(Package());`
`288`		`- if (i != packages.end())`
`289`		`- {`
`290`		`- if (i == --packages.end())`
`291`		`- return i;`
`292`		`- throw std::logic_error("Oops! Empty package not at the end of packages");`
`293`		`- }`
`294`	`280`	`return packages.end();`
`295`	`281`	`}`
`296`	`282`
`@@ -318,6 +304,8 @@ void PackageStore::write_index() const`
`318`	`304`	`auto &sdb = getServiceDatabase();`
`319`	`305`	`for (auto &cc : *this)`
`320`	`306`	`{`
	`307`	`+ if (cc.first == Package())`
	`308`	`+ continue;`
`321`	`309`	`sdb.addInstalledPackage(cc.first);`
`322`	`310`	`#ifdef _WIN32`
`323`	`311`	`create_link(cc.first.getDirSrc(), directories.storage_dir_lnk / "src" / (cc.first.target_name + ".lnk"));`
Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,11 @@ void Resolver::download_and_unpack()`
`378`	`378`	`void Resolver::post_download()`
`379`	`379`	`{`
`380`	`380`	`for (auto &cc : rd)`
	`381`	`+ {`
	`382`	`+ if (cc.first == Package())`
	`383`	`+ continue;`
`381`	`384`	`prepare_config(cc);`
	`385`	`+ }`
`382`	`386`	`}`
`383`	`387`
`384`	`388`	`void Resolver::prepare_config(PackageStore::PackageConfigs::value_type &cc)`