Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarafei Praliaskouski <komzpa@mapswith.me>2013-07-17 03:16:19 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:58:54 +0300
commit088c33c114c8cfca3e69be8ba4166fd546030145 (patch)
tree8c6be09a3d84dbdd3480d4c919d4de1da9869692 /platform/platform_linux.cpp
parent3a5d3fab09b2eede02b59850e1bb2a747a85b35a (diff)
[platform] don't fail on dbus-less environments (like buildfarm)
Diffstat (limited to 'platform/platform_linux.cpp')
-rw-r--r--platform/platform_linux.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/platform/platform_linux.cpp b/platform/platform_linux.cpp
index 5c7cf01b53..daeb3a024b 100644
--- a/platform/platform_linux.cpp
+++ b/platform/platform_linux.cpp
@@ -104,10 +104,15 @@ string Platform::UniqueClientId() const
if (IsFileExistsByFullPath("/etc/machine-id"))
machineFile = "/etc/machine-id";
- string content;
- FileReader(machineFile).ReadAsString(content);
+ if (IsFileExistsByFullPath(machineFile))
+ {
+ string content;
+ FileReader(machineFile).ReadAsString(content);
+ return content.substr(0, 32);
+ }
+ else
+ return "n0dbus0n0lsb00000000000000000000";
- return content.substr(0, 32);
}
void Platform::RunOnGuiThread(TFunctor const & fn)