diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-11-14 15:15:25 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-11-14 15:15:25 +0200 |
| commit | cdab85db413afdcd0c0e23c9a944bde2c8450ac5 (patch) | |
| tree | fc936e55b625cf0b14f671b100832607aab31583 /src | |
| parent | Merge pull request #2697 (diff) | |
| parent | Wallet API: override update subdir when built from src (diff) | |
| download | monero-cdab85db413afdcd0c0e23c9a944bde2c8450ac5.tar.xz | |
Merge pull request #2701
867b67c4 Wallet API: override update subdir when built from src (Jaquee)
Diffstat (limited to 'src')
| -rw-r--r-- | src/wallet/api/wallet_manager.cpp | 4 | ||||
| -rw-r--r-- | src/wallet/wallet2_api.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/wallet/api/wallet_manager.cpp b/src/wallet/api/wallet_manager.cpp index a64766c84..2326f54d3 100644 --- a/src/wallet/api/wallet_manager.cpp +++ b/src/wallet/api/wallet_manager.cpp @@ -434,12 +434,14 @@ std::string WalletManagerImpl::resolveOpenAlias(const std::string &address, bool return addresses.front(); } -std::tuple<bool, std::string, std::string, std::string, std::string> WalletManager::checkUpdates(const std::string &software, const std::string &subdir) +std::tuple<bool, std::string, std::string, std::string, std::string> WalletManager::checkUpdates(const std::string &software, std::string subdir) { #ifdef BUILD_TAG static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG); #else static const char buildtag[] = "source"; + // Override the subdir string when built from source + subdir = "source"; #endif std::string version, hash; diff --git a/src/wallet/wallet2_api.h b/src/wallet/wallet2_api.h index a8c150ca7..432c820cb 100644 --- a/src/wallet/wallet2_api.h +++ b/src/wallet/wallet2_api.h @@ -869,7 +869,7 @@ struct WalletManager virtual std::string resolveOpenAlias(const std::string &address, bool &dnssec_valid) const = 0; //! checks for an update and returns version, hash and url - static std::tuple<bool, std::string, std::string, std::string, std::string> checkUpdates(const std::string &software, const std::string &subdir); + static std::tuple<bool, std::string, std::string, std::string, std::string> checkUpdates(const std::string &software, std::string subdir); }; |