feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Docker: Use a optional<Environment> to handle the non-fetched state

Browse Source 
Change-Id: I93ef9da6c9c7731b28f9d6fab6413ce9c4f428b4
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-01-26 15:22:23 +01:00
parent dab859e776
commit 040ef3b7d3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/docker/dockerdevice.cpp
View File

@@ -198,7 +198,7 @@ public:
QString m_container; QString m_container;
Environment m_cachedEnviroment; std::optional<Environment> m_cachedEnviroment;
bool m_isShutdown = false; bool m_isShutdown = false;
DockerDeviceFileAccess m_fileAccess{this}; DockerDeviceFileAccess m_fileAccess{this};
}; };
@@ -500,7 +500,7 @@ void DockerDevicePrivate::stopCurrentContainer()
proc.runBlocking(); proc.runBlocking();
m_cachedEnviroment.clear(); m_cachedEnviroment.reset();
} }
bool DockerDevicePrivate::prepareForBuild(const Target *target) bool DockerDevicePrivate::prepareForBuild(const Target *target)
@@ -1137,11 +1137,11 @@ bool DockerDevicePrivate::addTemporaryMount(const FilePath &path, const FilePath
Environment DockerDevicePrivate::environment() Environment DockerDevicePrivate::environment()
{ {
if (!m_cachedEnviroment.hasChanges()) if (!m_cachedEnviroment)
fetchSystemEnviroment(); fetchSystemEnviroment();
QTC_CHECK(m_cachedEnviroment.hasChanges()); QTC_ASSERT(m_cachedEnviroment, return {});
return m_cachedEnviroment; return m_cachedEnviroment.value();
} }
void DockerDevicePrivate::shutdown() void DockerDevicePrivate::shutdown()