mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-03-08 06:35:25 +01:00
scripted-diff: Rename PACKAGE_* variables to CLIENT_*
This change ensures consistent use of the `CLIENT_` namespace everywhere
in the repository.
-BEGIN VERIFY SCRIPT-
ren() { sed -i "s/\<$1\>/$2/g" $( git grep -l "$1" ./cmake ./src :\(exclude\)./src/secp256k1 ./test ) ; }
ren PACKAGE_NAME CLIENT_NAME
ren PACKAGE_VERSION CLIENT_VERSION_STRING
ren PACKAGE_URL CLIENT_URL
ren PACKAGE_BUGREPORT CLIENT_BUGREPORT
-END VERIFY SCRIPT-
This commit is contained in:
@@ -1079,7 +1079,7 @@ static bool LockDataDirectory(bool probeOnly)
|
||||
case util::LockResult::ErrorWrite:
|
||||
return InitError(strprintf(_("Cannot write to data directory '%s'; check permissions."), fs::PathToString(datadir)));
|
||||
case util::LockResult::ErrorLock:
|
||||
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. %s is probably already running."), fs::PathToString(datadir), PACKAGE_NAME));
|
||||
return InitError(strprintf(_("Cannot obtain a lock on data directory %s. %s is probably already running."), fs::PathToString(datadir), CLIENT_NAME));
|
||||
case util::LockResult::Success: return true;
|
||||
} // no default case, so the compiler can warn about missing cases
|
||||
assert(false);
|
||||
@@ -1091,11 +1091,11 @@ bool AppInitSanityChecks(const kernel::Context& kernel)
|
||||
auto result{kernel::SanityChecks(kernel)};
|
||||
if (!result) {
|
||||
InitError(util::ErrorString(result));
|
||||
return InitError(strprintf(_("Initialization sanity check failed. %s is shutting down."), PACKAGE_NAME));
|
||||
return InitError(strprintf(_("Initialization sanity check failed. %s is shutting down."), CLIENT_NAME));
|
||||
}
|
||||
|
||||
if (!ECC_InitSanityCheck()) {
|
||||
return InitError(strprintf(_("Elliptic curve cryptography sanity check failure. %s is shutting down."), PACKAGE_NAME));
|
||||
return InitError(strprintf(_("Elliptic curve cryptography sanity check failure. %s is shutting down."), CLIENT_NAME));
|
||||
}
|
||||
|
||||
// Probe the data directory lock to give an early error message, if possible
|
||||
|
||||
Reference in New Issue
Block a user