summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@nokia.com>2012-02-24 10:24:04 +0100
committerKarsten Heimrich <karsten.heimrich@nokia.com>2012-02-24 12:51:10 +0100
commitab7fca0cfa59883b20e6b2d1e0b772b03106b216 (patch)
treed404bafecb31620219cec0cf8c3fa9981583c371
parentc1f159e6dc85a1b9a0b63ec5e2fd99a722ddfda3 (diff)
Be more verbose about the file we fail. Adapt punctuation.
Change-Id: I88d8616757513ea14fbaa78a707f00095db16629 Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
-rw-r--r--installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp6
-rw-r--r--installerbuilder/libinstaller/getrepositorymetainfojob.cpp4
2 files changed, 6 insertions, 4 deletions
diff --git a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp
index a9f042af0..0a3fc4564 100644
--- a/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp
+++ b/installerbuilder/libinstaller/3rdparty/kdtools/kdupdaterfiledownloader.cpp
@@ -594,7 +594,8 @@ void KDUpdater::LocalFileDownloader::doDownload()
d->source = new QFile(localFile, this);
if (!d->source->open(QFile::ReadOnly)) {
onError();
- setDownloadAborted(tr("Cannot open source file for reading."));
+ setDownloadAborted(tr("Cannot open source file '%1' for reading.").arg(QFileInfo(localFile)
+ .fileName()));
return;
}
@@ -609,7 +610,8 @@ void KDUpdater::LocalFileDownloader::doDownload()
if (!d->destination->isOpen()) {
onError();
- setDownloadAborted(tr("Cannot open destination file for writing."));
+ setDownloadAborted(tr("Cannot open destination file '%1' for writing.")
+ .arg(QFileInfo(d->destination->fileName()).fileName()));
return;
}
diff --git a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
index e97246fc9..0b95f2db0 100644
--- a/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
+++ b/installerbuilder/libinstaller/getrepositorymetainfojob.cpp
@@ -363,7 +363,7 @@ void GetRepositoryMetaInfoJob::updatesXmlDownloadFinished()
void GetRepositoryMetaInfoJob::updatesXmlDownloadError(const QString &err)
{
if (m_retriesLeft <= 0) {
- const QString msg = tr("Could not fetch Updates.xml from repository: %1. Error: %2.")
+ const QString msg = tr("Could not fetch Updates.xml from repository: %1. Error: %2")
.arg(m_repository.url().toString(), err);
QMessageBox::StandardButtons buttons = QMessageBox::Retry | QMessageBox::Cancel;
@@ -493,7 +493,7 @@ void GetRepositoryMetaInfoJob::metaDownloadFinished()
void GetRepositoryMetaInfoJob::metaDownloadError(const QString &err)
{
if (m_retriesLeft <= 0) {
- const QString msg = tr("Could not download meta information for component: %1. Error: %2.")
+ const QString msg = tr("Could not download meta information for component: %1. Error: %2")
.arg(m_currentPackageName, err);
QMessageBox::StandardButtons buttons = QMessageBox::Retry | QMessageBox::Cancel;