Ticket #11195: patch-v2.txt

File patch-v2.txt, 1.7 KB (added by Bill Meek <keemllib@…>, 13 years ago)

Corrected patch file.

Line 
1[1mdiff --git a/mythtv/libs/libmythtv/datadirect.cpp b/mythtv/libs/libmythtv/datadirect.cpp[m
2[1mindex 1870ff0..7583df8 100644[m
3[1m--- a/mythtv/libs/libmythtv/datadirect.cpp[m
4[1m+++ b/mythtv/libs/libmythtv/datadirect.cpp[m
5[36m@@ -1006,8 +1006,14 @@[m [mbool DataDirectProcessor::DDPost(QString ddurl, QString &inputFile,[m
6 postdata += "</SOAP-ENV:Body>\n";[m
7 postdata += "</SOAP-ENV:Envelope>\n";[m
8 [m
9[31m- if (inputFile.isEmpty()) {[m
10[32m+[m[32m if (inputFile.isEmpty())[m
11[32m+[m[32m {[m
12 inputFile = QString("/tmp/mythtv_ddp_data");[m
13[32m+[m[32m if (QFile(inputFile).exists() && !QFileInfo(inputFile).isWritable())[m
14[32m+[m[32m {[m
15[32m+[m[32m err_txt = QString("Aborting: %1 is not writable").arg(inputFile);[m
16[32m+[m[32m return false;[m
17[32m+[m[32m }[m
18 }[m
19 [m
20 QHash<QByteArray, QByteArray> headers;[m
21[36m@@ -1039,7 +1045,16 @@[m [mbool DataDirectProcessor::DDPost(QString ddurl, QString &inputFile,[m
22 uncompressed = postdata;[m
23 [m
24 QFile file(inputFile);[m
25[31m- file.open(QIODevice::WriteOnly);[m
26[32m+[m[32m if (!file.open(QIODevice::WriteOnly))[m
27[32m+[m[32m {[m
28[32m+[m[32m err_txt = QString("Aborting: download OK, but %1 is not writable")[m
29[32m+[m[32m .arg(inputFile);[m
30[32m+[m[32m return false;[m
31[32m+[m[32m }[m
32[32m+[m[32m file.setPermissions(inputFile,[m
33[32m+[m[32m QFile::ReadOwner | QFile::WriteOwner |[m
34[32m+[m[32m QFile::ReadGroup | QFile::WriteGroup |[m
35[32m+[m[32m QFile::ReadOther | QFile::WriteOther);[m
36 file.write(uncompressed);[m
37 file.close();[m
38 [m