forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hot-fix for #570 (#572)

This commit is contained in:
Sebastian Wilzbach 2018-03-24 20:24:39 +01:00 committed by BBasile
parent eb281030f5
commit 14ae261d55
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dscanner/main.d
View File

@ -476,7 +476,7 @@ string getConfigurationLocation()
/// Patch the INI file to v0.5.0 format. /// Patch the INI file to v0.5.0 format.
//TODO: remove this from v0.6.0 //TODO: remove this from v0.6.0
bool hasWrongIniFileSection(string confiFilename, bool patch) bool hasWrongIniFileSection(string configFilename, bool patch)
{ {
import std.string : indexOf; import std.string : indexOf;
import std.array : replace; import std.array : replace;
@ -486,12 +486,12 @@ bool hasWrongIniFileSection(string confiFilename, bool patch)
static immutable v1 = "analysis.config.StaticAnalysisConfig"; static immutable v1 = "analysis.config.StaticAnalysisConfig";
static immutable v2 = "dscanner.analysis.config.StaticAnalysisConfig"; static immutable v2 = "dscanner.analysis.config.StaticAnalysisConfig";
char[] c = cast(char[]) readFile(confiFilename); char[] c = cast(char[]) readFile(configFilename);
try if (const ptrdiff_t i = c.indexOf(v1)) try if (c.indexOf(v2) < 0)
{ {
if (!patch) if (!patch)
{ {
writeln("warning, the configuration file `", confiFilename, "` contains an outdated property"); writeln("warning, the configuration file `", configFilename, "` contains an outdated property");
writeln("change manually [", v1, "] to [", v2, "]" ); writeln("change manually [", v1, "] to [", v2, "]" );
writeln("or restart D-Scanner with the `--patchConfig` option"); writeln("or restart D-Scanner with the `--patchConfig` option");
result = true; result = true;
@ -499,8 +499,8 @@ bool hasWrongIniFileSection(string confiFilename, bool patch)
else else
{ {
c = replace(c, v1, v2); c = replace(c, v1, v2);
std.file.write(confiFilename, c); std.file.write(configFilename, c);
writeln("the configuration file `", confiFilename, "` has been updated correctly"); writeln("the configuration file `", configFilename, "` has been updated correctly");
} }
} }
catch(Exception e) catch(Exception e)