Merge #11108: Changing -txindex requires -reindex, not -reindex-chainstate

MarcoFalke · MarcoFalke · commit 77fc469fc78c · 2017-08-24T17:31:05.000-04:00
cd0ea48 Changing -txindex requires -reindex, not -reindex-chainstate (Matt Corallo) Pull request description: If there's an 0.15.0rc3, this should go in it. Tree-SHA512: 857e77f0af9c055a3d1d91f37474ee9e06d6bc8c5ed21b29201b6c386801e7041523949076cdf0daa4d357a5175ce49394d85a1bedfbf13f3e577bdb6da1d6ce
diff --git a/src/init.cpp b/src/init.cpp
@@ -1428,7 +1428,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
 
                 // Check for changed -txindex state
                 if (fTxIndex != gArgs.GetBoolArg("-txindex", DEFAULT_TXINDEX)) {
-                    strLoadError = _("You need to rebuild the database using -reindex-chainstate to change -txindex");
+                    strLoadError = _("You need to rebuild the database using -reindex to change -txindex");
                     break;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -1428,7 +1428,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)`
`1428`	`1428`
`1429`	`1429`	`// Check for changed -txindex state`
`1430`	`1430`	`if (fTxIndex != gArgs.GetBoolArg("-txindex", DEFAULT_TXINDEX)) {`
`1431`		`- strLoadError = _("You need to rebuild the database using -reindex-chainstate to change -txindex");`
	`1431`	`+ strLoadError = _("You need to rebuild the database using -reindex to change -txindex");`
`1432`	`1432`	`break;`
`1433`	`1433`	`}`
`1434`	`1434`