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

Utils: Fix copyFile to include permissions

Browse Source 
Also adds line breaks to info output.

Change-Id: I314ab87a47d7bd7541acb6a1553238fcfc27099d
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-10-25 13:52:04 +02:00
parent b9062e9c80
commit d46a079744
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/utils/filepath.cpp
View File

@@ -1264,7 +1264,16 @@ bool FilePath::copyFile(const FilePath &target) const
const std::optional<QByteArray> ba = fileContents(); const std::optional<QByteArray> ba = fileContents();
if (!ba) if (!ba)
return false; return false;
return target.writeFileContents(*ba); const auto perms = permissions();
if (!target.writeFileContents(*ba))
return false;
if (!target.setPermissions(perms)) {
target.removeFile();
return false;
}
return true;
} }
return fileAccess()->copyFile(*this, target); return fileAccess()->copyFile(*this, target);
} }

4
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -1458,7 +1458,7 @@ private:
const FilePath targetDir = target.parentDir(); const FilePath targetDir = target.parentDir();
if (!m_checkedDirectories.contains(targetDir)) { if (!m_checkedDirectories.contains(targetDir)) {
emit progress(tr("Creating directory: %1") emit progress(tr("Creating directory: %1\n")
.arg(targetDir.toUserOutput())); .arg(targetDir.toUserOutput()));
if (!targetDir.ensureWritableDir()) { if (!targetDir.ensureWritableDir()) {
result.m_errorString = tr("Failed."); result.m_errorString = tr("Failed.");
@@ -1469,7 +1469,7 @@ private:
m_checkedDirectories.insert(targetDir); m_checkedDirectories.insert(targetDir);
} }
emit progress(tr("Copying %1/%2: %3 -> %4") emit progress(tr("Copying %1/%2: %3 -> %4\n")
.arg(m_currentIndex).arg(m_fileCount).arg(source.toUserOutput(), target.toUserOutput())); .arg(m_currentIndex).arg(m_fileCount).arg(source.toUserOutput(), target.toUserOutput()));
if (!source.copyFile(target)) { if (!source.copyFile(target)) {
result.m_errorString = tr("Failed."); result.m_errorString = tr("Failed.");