diff --git a/source/dub/packagemanager.d b/source/dub/packagemanager.d index 075e8ed..2278d35 100644 --- a/source/dub/packagemanager.d +++ b/source/dub/packagemanager.d @@ -1066,7 +1066,7 @@ repository.scan(this, refresh); foreach (ref repository; this.m_repositories) - repository.loadOverrides(); + repository.loadOverrides(this); this.m_initialized = true; } @@ -1378,17 +1378,17 @@ this.packagePath = path; } - void loadOverrides() + void loadOverrides(PackageManager mgr) { - import dub.internal.vibecompat.core.file; - this.overrides = null; auto ovrfilepath = this.packagePath ~ LocalOverridesFilename; - if (existsFile(ovrfilepath)) { + if (mgr.existsFile(ovrfilepath)) { logWarn("Found local override file: %s", ovrfilepath); logWarn(OverrideDepMsg); logWarn("Replace with a path-based dependency in your project or a custom cache path"); - foreach (entry; jsonFromFile(ovrfilepath)) { + const text = mgr.readText(ovrfilepath); + auto json = parseJsonString(text, ovrfilepath.toNativeString()); + foreach (entry; json) { PackageOverride_ ovr; ovr.package_ = entry["name"].get!string; ovr.source = VersionRange.fromString(entry["version"].get!string); diff --git a/source/dub/test/base.d b/source/dub/test/base.d index 3566f57..fd9717f 100644 --- a/source/dub/test/base.d +++ b/source/dub/test/base.d @@ -345,29 +345,6 @@ assert(0, "Function not implemented"); } - /** - * This function usually scans the filesystem for packages. - * - * We don't want to do IO access and rely on users adding the packages - * before the test starts instead. - * - * Note: Deprecated `refresh(bool)` does IO, but it's deprecated - */ - public override void refresh() - { - // Local packages are not yet implemented - version (none) { - foreach (ref repository; this.m_repositories) - repository.scanLocalPackages(false, this); - } - this.m_internal.scan(this, false); - foreach (ref repository; this.m_repositories) - repository.scan(this, false); - - // Removed override loading usually done here as they are deprecated - this.m_initialized = true; - } - /** * Re-Implementation of `gitClone`. *