summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/installzip.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/installzip.cpp')
-rw-r--r--rbutil/rbutilqt/installzip.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/rbutil/rbutilqt/installzip.cpp b/rbutil/rbutilqt/installzip.cpp
index b947553f33..4f99d7bc31 100644
--- a/rbutil/rbutilqt/installzip.cpp
+++ b/rbutil/rbutilqt/installzip.cpp
@@ -33,7 +33,7 @@ void ZipInstaller::install(ProgressloggerInterface* dp)
33 m_dp = dp; 33 m_dp = dp;
34 34
35 m_dp->addItem(tr("Downloading file %1.%2") 35 m_dp->addItem(tr("Downloading file %1.%2")
36 .arg(QFileInfo(m_url).baseName(), QFileInfo(m_url).completeSuffix())); 36 .arg(QFileInfo(m_url).baseName(), QFileInfo(m_url).completeSuffix()),LOGINFO);
37 37
38 // temporary file needs to be opened to get the filename 38 // temporary file needs to be opened to get the filename
39 downloadFile.open(); 39 downloadFile.open();
@@ -72,23 +72,23 @@ void ZipInstaller::downloadDone(bool error)
72 } 72 }
73 m_dp->setProgressValue(max); 73 m_dp->setProgressValue(max);
74 if(getter->httpResponse() != 200) { 74 if(getter->httpResponse() != 200) {
75 m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse())); 75 m_dp->addItem(tr("Download error: received HTTP error %1.").arg(getter->httpResponse()),LOGERROR);
76 m_dp->abort(); 76 m_dp->abort();
77 emit done(true); 77 emit done(true);
78 return; 78 return;
79 } 79 }
80 if(error) { 80 if(error) {
81 m_dp->addItem(tr("Download error: %1").arg(getter->errorString())); 81 m_dp->addItem(tr("Download error: %1").arg(getter->errorString()),LOGERROR);
82 m_dp->abort(); 82 m_dp->abort();
83 emit done(true); 83 emit done(true);
84 return; 84 return;
85 } 85 }
86 else m_dp->addItem(tr("Download finished.")); 86 else m_dp->addItem(tr("Download finished."),LOGOK);
87 87
88 // unzip downloaded file 88 // unzip downloaded file
89 qDebug() << "about to unzip the downloaded file" << m_file << "to" << m_mountpoint; 89 qDebug() << "about to unzip the downloaded file" << m_file << "to" << m_mountpoint;
90 90
91 m_dp->addItem(tr("Extracting file.")); 91 m_dp->addItem(tr("Extracting file."),LOGINFO);
92 92
93 qDebug() << "file to unzip: " << m_file; 93 qDebug() << "file to unzip: " << m_file;
94 UnZip::ErrorCode ec; 94 UnZip::ErrorCode ec;
@@ -96,7 +96,7 @@ void ZipInstaller::downloadDone(bool error)
96 ec = uz.openArchive(m_file); 96 ec = uz.openArchive(m_file);
97 if(ec != UnZip::Ok) { 97 if(ec != UnZip::Ok) {
98 m_dp->addItem(tr("Opening archive failed: %1.") 98 m_dp->addItem(tr("Opening archive failed: %1.")
99 .arg(uz.formatError(ec))); 99 .arg(uz.formatError(ec)),LOGERROR);
100 m_dp->abort(); 100 m_dp->abort();
101 emit done(false); 101 emit done(false);
102 return; 102 return;
@@ -105,13 +105,13 @@ void ZipInstaller::downloadDone(bool error)
105 ec = uz.extractAll(m_mountpoint); 105 ec = uz.extractAll(m_mountpoint);
106 if(ec != UnZip::Ok) { 106 if(ec != UnZip::Ok) {
107 m_dp->addItem(tr("Extracting failed: %1.") 107 m_dp->addItem(tr("Extracting failed: %1.")
108 .arg(uz.formatError(ec))); 108 .arg(uz.formatError(ec)),LOGERROR);
109 m_dp->abort(); 109 m_dp->abort();
110 emit done(false); 110 emit done(false);
111 return; 111 return;
112 } 112 }
113 113
114 m_dp->addItem(tr("creating installation log")); 114 m_dp->addItem(tr("creating installation log"),LOGINFO);
115 115
116 QStringList zipContents = uz.fileList(); 116 QStringList zipContents = uz.fileList();
117 117
@@ -127,7 +127,7 @@ void ZipInstaller::downloadDone(bool error)
127 // remove temporary file 127 // remove temporary file
128 downloadFile.remove(); 128 downloadFile.remove();
129 129
130 m_dp->addItem(tr("Extraction finished successfully.")); 130 m_dp->addItem(tr("Extraction finished successfully."),LOGOK);
131 m_dp->abort(); 131 m_dp->abort();
132 emit done(false); 132 emit done(false);
133} 133}