Look for extensions in $CHROMIUM_EXTENSION_DIRECTORY instead of /usr/share/chromium/extensions. --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -4,6 +4,7 @@ #include "chrome/common/chrome_paths.h" +#include "base/environment.h" #include "base/files/file_util.h" #include "base/logging.h" #include "base/native_library.h" @@ -511,7 +512,13 @@ #endif #if defined(OS_LINUX) || defined(OS_CHROMEOS) case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { - cur = base::FilePath(kFilepathSinglePrefExtensions); + std::unique_ptr environment(base::Environment::Create()); + std::string extension_dir; + if (environment->GetVar("CHROMIUM_EXTENSION_DIRECTORY", &extension_dir)) { + cur = base::FilePath(extension_dir); + } else { + cur = base::FilePath(kFilepathSinglePrefExtensions); + } break; } #endif >
aboutsummaryrefslogtreecommitdiff
path: root/tests/services.scm
AgeCommit message (Expand)Author
2023-08-31gnu: services: Revert to deleting and updating all matching services...This patch reverts the behavior introduced in 181951207339508789b28ba7cb914f983319920f which caused ‘modify-services’ clauses to only match a single instance of a service. We will now match all service instances when doing a deletion or update, while still raising an exception when trying to match against a service that does not exist in the services list, or which was deleted explicitly by a ‘delete’ clause (or an update clause that returns ‘#f’ for the service). Fixes: #64106 * gnu/services.scm (%modify-services): New procedure. (modify-services): Use it. (apply-clauses): Add DELETED-SERVICES argument, change to modify one service at a time. * tests/services.scm ("modify-services: delete then modify") ("modify-services: modify then delete") ("modify-services: delete multiple services of the same type") ("modify-services: modify multiple services of the same type"): New tests. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> Brian Cully