kumi/danicoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2514

Browse source 
cda45a7f Source updates are in a source subdirectory (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-10-22 23:02:39 +02:00
commit a666d36ca6
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/cryptonote_core/cryptonote_core.cpp
View file

@ -1291,11 +1291,12 @@ namespace cryptonote
bool core::check_updates() bool core::check_updates()
{ {
static const char software[] = "monero"; static const char software[] = "monero";
static const char subdir[] = "cli"; // because it can never be simple
#ifdef BUILD_TAG #ifdef BUILD_TAG
static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG); static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG);
static const char subdir[] = "cli"; // because it can never be simple
#else #else
static const char buildtag[] = "source"; static const char buildtag[] = "source";
static const char subdir[] = "source"; // because it can never be simple
#endif #endif
if (check_updates_level == UPDATES_DISABLED) if (check_updates_level == UPDATES_DISABLED)

6
src/rpc/core_rpc_server.cpp
View file

@ -1560,8 +1560,10 @@ namespace cryptonote
static const char software[] = "monero"; static const char software[] = "monero";
#ifdef BUILD_TAG #ifdef BUILD_TAG
static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG); static const char buildtag[] = BOOST_PP_STRINGIZE(BUILD_TAG);
static const char subdir[] = "cli";
#else #else
static const char buildtag[] = "source"; static const char buildtag[] = "source";
static const char subdir[] = "source";
#endif #endif
if (req.command != "check" && req.command != "download" && req.command != "update") if (req.command != "check" && req.command != "download" && req.command != "update")
@ -1584,8 +1586,8 @@ namespace cryptonote
} }
res.update = true; res.update = true;
res.version = version; res.version = version;
res.user_uri = tools::get_update_url(software, "cli", buildtag, version, true); res.user_uri = tools::get_update_url(software, subdir, buildtag, version, true);
res.auto_uri = tools::get_update_url(software, "cli", buildtag, version, false); res.auto_uri = tools::get_update_url(software, subdir, buildtag, version, false);
res.hash = hash; res.hash = hash;
if (req.command == "check") if (req.command == "check")
{ {