r18652 by jghali - #ifndef permissions setting code during colllect for output on Windows, on Windows this code has no effect anyway
scribus-commit
scribus-commit at lists.scribus.net
Sun Dec 15 19:06:56 UTC 2013
Author: jghali
Date: Sun Dec 15 19:06:56 2013
New Revision: 18652
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18652
Log:
#ifndef permissions setting code during colllect for output on Windows, on Windows this code has no effect anyway
Modified:
trunk/Scribus/scribus/collect4output.cpp
Modified: trunk/Scribus/scribus/collect4output.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18652&path=/trunk/Scribus/scribus/collect4output.cpp
==============================================================================
--- trunk/Scribus/scribus/collect4output.cpp (original)
+++ trunk/Scribus/scribus/collect4output.cpp Sun Dec 15 19:06:56 2013
@@ -467,9 +467,10 @@
if (copy)
{
QString outFile(m_outputDirectory + "images/" + newFile);
- bool success=copyFileAtomic(oldFile, outFile);
+ bool success = copyFileAtomic(oldFile, outFile);
if (!success)
qDebug()<<"CollectForOutput::collectFile copyFileAtomic failed for"<<oldFile<<"to"<<outFile;
+#ifndef Q_OS_WIN32
else
{
QFile of(outFile);
@@ -482,6 +483,7 @@
else
qDebug()<<"Unable to set permissions successfully while collecting for output on"<<outFile<<"as the file does not exist";
}
+#endif
}
collectedFiles[newFile] = oldFile;
return m_outputDirectory + "images/" + newFile;
More information about the scribus-commit
mailing list