aboutsummaryrefslogtreecommitdiff
path: root/src/zen/cmds/admin_cmd.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/zen/cmds/admin_cmd.cpp')
-rw-r--r--src/zen/cmds/admin_cmd.cpp19
1 files changed, 11 insertions, 8 deletions
diff --git a/src/zen/cmds/admin_cmd.cpp b/src/zen/cmds/admin_cmd.cpp
index 995ed4136..835e01151 100644
--- a/src/zen/cmds/admin_cmd.cpp
+++ b/src/zen/cmds/admin_cmd.cpp
@@ -714,26 +714,29 @@ CopyStateCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
throw OptionParseException("data path must be given");
}
- if (!std::filesystem::is_directory(m_DataPath))
+ std::filesystem::path DataPath = StringToPath(m_DataPath);
+ std::filesystem::path TargetPath = StringToPath(m_TargetPath);
+
+ if (!std::filesystem::is_directory(DataPath))
{
throw OptionParseException("data path must exist");
}
- if (m_TargetPath.empty())
+ if (TargetPath.empty())
{
throw OptionParseException("target path must be given");
}
- std::filesystem::path RootManifestPath = m_DataPath / "root_manifest";
- std::filesystem::path TargetRootManifestPath = m_TargetPath / "root_manifest";
+ std::filesystem::path RootManifestPath = DataPath / "root_manifest";
+ std::filesystem::path TargetRootManifestPath = TargetPath / "root_manifest";
if (!TryCopy(RootManifestPath, TargetRootManifestPath))
{
throw OptionParseException("data path is invalid, missing root_manifest");
}
- std::filesystem::path CachePath = m_DataPath / "cache";
- std::filesystem::path TargetCachePath = m_TargetPath / "cache";
+ std::filesystem::path CachePath = DataPath / "cache";
+ std::filesystem::path TargetCachePath = TargetPath / "cache";
// Copy cache state
DirectoryContent CacheDirectoryContent;
@@ -778,8 +781,8 @@ CopyStateCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** argv)
}
}
- std::filesystem::path CasPath = m_DataPath / "cas";
- std::filesystem::path TargetCasPath = m_TargetPath / "cas";
+ std::filesystem::path CasPath = DataPath / "cas";
+ std::filesystem::path TargetCasPath = TargetPath / "cas";
{
std::filesystem::path UCasRootPath = CasPath / ".ucas_root";