Merge #3285

3285: Support Mantic compilers r=townsend2010 a=luis4a0

Co-authored-by: Luis Peñaranda <[email protected]>

Author: Chris Townsend

3rd-party/fmt

@@ -17,7 +17,7 @@ Version: 0.10.4 (+[our patches](https://github.com/CanonicalLtd/libssh/compare/l
 <https://www.libssh.org/>
 
 ### fmt
-Version: 9.1.0 |
+Version: 10.1.1 |
 <https://github.com/fmtlib/fmt.git> |
 <https://github.com/fmtlib/fmt/releases>
 

3rd-party/submodule_info.md

@@ -21,6 +21,7 @@
 #define MULTIPASS_IP_ADDRESS_H
 
 #include <array>
+#include <cstdint>
 #include <string>
 
 namespace multipass

include/multipass/ip_address.h

@@ -53,7 +53,7 @@ class WritableFile
     }
 
 private:
-    std::unique_ptr<FILE, decltype(fclose)*> fp;
+    std::unique_ptr<FILE, std::function<int(FILE*)>> fp;
 };
 
 class EVPKey

src/cert/ssl_cert_provider.cpp

@@ -59,9 +59,9 @@ mp::ReturnCode cmd::Transfer::run(mp::ArgParser* parser)
                     auto& [sources, target] = *args;
                     std::error_code err;
                     if (sources.size() > 1 && !MP_FILEOPS.is_directory(target, err) && !err)
-                        throw std::runtime_error{fmt::format("Target {} is not a directory", target)};
+                        throw std::runtime_error{fmt::format("Target {:?} is not a directory", target)};
                     else if (err)
-                        throw std::runtime_error{fmt::format("Cannot access {}: {}", target, err.message())};
+                        throw std::runtime_error{fmt::format("Cannot access {:?}: {}", target, err.message())};
                     for (auto [s, s_end] = sources.equal_range(instance_name); s != s_end; ++s)
                         success &= sftp_client->pull(s->second, target, flags);
                 }
@@ -70,7 +70,7 @@ mp::ReturnCode cmd::Transfer::run(mp::ArgParser* parser)
                 {
                     auto& [sources, target] = *args;
                     if (sources.size() > 1 && !sftp_client->is_remote_dir(target))
-                        throw std::runtime_error{fmt::format("Target {} is not a directory", target)};
+                        throw std::runtime_error{fmt::format("Target {:?} is not a directory", target)};
                     for (const auto& source : sources)
                         success &= sftp_client->push(source, target, flags);
                 }

src/client/cli/cmd/transfer.cpp

@@ -188,7 +188,8 @@ bool SFTPClient::push_dir(const fs::path& source_path, const fs::path& target_pa
             {
                 if (sftp_mkdir(sftp.get(), remote_file_path.u8string().c_str(), 0777) != SSH_OK &&
                     sftp_get_error(sftp.get()) != SSH_FX_FILE_ALREADY_EXISTS)
-                    throw SFTPError{"cannot create remote directory {}: {}", remote_file_path,
+                    throw SFTPError{"cannot create remote directory {:?}: {}",
+                                    remote_file_path,
                                     ssh_get_error(sftp->session)};
 
                 subdirectory_perms.emplace_back(remote_file_path, status.permissions());
@@ -202,13 +203,14 @@ bool SFTPClient::push_dir(const fs::path& source_path, const fs::path& target_pa
 
                 auto remote_file_info = mp_sftp_lstat(sftp.get(), remote_file_path.u8string().c_str());
                 if (remote_file_info && remote_file_info->type == SSH_FILEXFER_TYPE_DIRECTORY)
-                    throw SFTPError{"cannot overwrite remote directory {} with non-directory", remote_file_path};
+                    throw SFTPError{"cannot overwrite remote directory {:?} with non-directory", remote_file_path};
 
                 if ((sftp_unlink(sftp.get(), remote_file_path.u8string().c_str()) != SSH_FX_OK &&
                      sftp_get_error(sftp.get()) != SSH_FX_NO_SUCH_FILE) ||
                     sftp_symlink(sftp.get(), link_target.u8string().c_str(), remote_file_path.u8string().c_str()) !=
                         SSH_FX_OK)
-                    throw SFTPError{"cannot create remote symlink {}: {}", remote_file_path,
+                    throw SFTPError{"cannot create remote symlink {:?}: {}",
+                                    remote_file_path,
                                     ssh_get_error(sftp->session)};
                 break;
             }

src/ssh/sftp_client.cpp

@@ -79,7 +79,7 @@ fs::path SFTPUtils::get_remote_file_target(sftp_session sftp, const fs::path& so
     target_full_path += source_path.filename().u8string().insert(0, "/");
     target_attr = mp_sftp_stat(sftp, target_full_path.u8string().c_str());
     if (target_attr && target_attr->type == SSH_FILEXFER_TYPE_DIRECTORY)
-        throw SFTPError{"cannot overwrite remote directory {} with non-directory", target_full_path};
+        throw SFTPError{"cannot overwrite remote directory {:?} with non-directory", target_full_path};
 
     return target_full_path;
 }
@@ -136,10 +136,10 @@ fs::path SFTPUtils::get_remote_dir_target(sftp_session sftp, const fs::path& sou
     auto child_path_string = child_path.u8string();
     auto child_info = mp_sftp_stat(sftp, child_path_string.c_str());
     if (child_info && child_info->type != SSH_FILEXFER_TYPE_DIRECTORY)
-        throw SFTPError{"cannot overwrite remote non-directory {} with directory", child_path};
+        throw SFTPError{"cannot overwrite remote non-directory {:?} with directory", child_path};
 
     if (!child_info && sftp_mkdir(sftp, child_path_string.c_str(), 0777) != SSH_FX_OK)
-        throw SFTPError{"cannot create remote directory {}: {}", child_path, ssh_get_error(sftp->session)};
+        throw SFTPError{"cannot create remote directory {:?}: {}", child_path, ssh_get_error(sftp->session)};
 
     return child_path;
 }
@@ -154,9 +154,9 @@ void SFTPUtils::mkdir_recursive(sftp_session sftp, const fs::path& path)
     for (const auto& partial_path : partial_paths)
         if (auto attr = mp_sftp_lstat(sftp, partial_path.u8string().c_str());
             attr && attr->type != SSH_FILEXFER_TYPE_DIRECTORY)
-            throw SFTPError{"cannot overwrite remote non-directory {} with directory", partial_path};
+            throw SFTPError{"cannot overwrite remote non-directory {:?} with directory", partial_path};
         else if (!attr && sftp_mkdir(sftp, partial_path.u8string().c_str(), 0777) != SSH_FX_OK)
-            throw SFTPError{"cannot create remote directory {}: {}", partial_path, ssh_get_error(sftp->session)};
+            throw SFTPError{"cannot create remote directory {:?}: {}", partial_path, ssh_get_error(sftp->session)};
 }
 
 std::unique_ptr<SFTPClient> SFTPUtils::make_SFTPClient(const std::string& host, int port, const std::string& username,