diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-10-22 23:02:39 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-10-22 23:02:39 +0200 |
| commit | a666d36ca62fec177b10b8bc17217e90c1ffec7a (patch) | |
| tree | 4284ef1d093f2e0c5867ef525ead4092906cffe8 | |
| parent | Merge pull request #2493 (diff) | |
| parent | Source updates are in a source subdirectory (diff) | |
| download | monero-a666d36ca62fec177b10b8bc17217e90c1ffec7a.tar.xz | |
Merge pull request #2514
cda45a7f Source updates are in a source subdirectory (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_core/cryptonote_core.cpp | 3 | ||||
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index c7863b816..a2833f50e 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -1291,11 +1291,12 @@ namespace cryptonote bool core::check_updates() { static const char software[] = "monero"; - static const char subdir[] = "cli"; // because it can never be simple #ifdef BUILD_TAG static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG); + static const char subdir[] = "cli"; // because it can never be simple #else static const char buildtag[] = "source"; + static const char subdir[] = "source"; // because it can never be simple #endif if (check_updates_level == UPDATES_DISABLED) diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index a6a61705b..31b6638b2 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -1560,8 +1560,10 @@ namespace cryptonote static const char software[] = "monero"; #ifdef BUILD_TAG static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG); + static const char subdir[] = "cli"; #else static const char buildtag[] = "source"; + static const char subdir[] = "source"; #endif if (req.command != "check" && req.command != "download" && req.command != "update") @@ -1584,8 +1586,8 @@ namespace cryptonote } res.update = true; res.version = version; - res.user_uri = tools::get_update_url(software, "cli", buildtag, version, true); - res.auto_uri = tools::get_update_url(software, "cli", buildtag, version, false); + res.user_uri = tools::get_update_url(software, subdir, buildtag, version, true); + res.auto_uri = tools::get_update_url(software, subdir, buildtag, version, false); res.hash = hash; if (req.command == "check") { |