summaryrefslogtreecommitdiffstats
path: root/installerbuilder
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@nokia.com>2011-08-24 14:35:28 +0200
committerKarsten Heimrich <karsten.heimrich@nokia.com>2011-08-24 16:34:55 +0200
commitde1d3d00b2cc66c3cca12f1989914f531822aee5 (patch)
treec8add22ec3d2560eb38f6573dae0bba76c93cedd /installerbuilder
parent849b03f9ecd403be5a3150eb52fefa79a7eced97 (diff)
make some more ouput if it can't copy script file
Change-Id: I8bb8081f91bdc7433f6bfec71e34c904004d28c6 Reviewed-on: http://codereview.qt.nokia.com/3517 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Diffstat (limited to 'installerbuilder')
-rw-r--r--installerbuilder/common/repositorygen.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/installerbuilder/common/repositorygen.cpp b/installerbuilder/common/repositorygen.cpp
index 7c77817e7..662df43ee 100644
--- a/installerbuilder/common/repositorygen.cpp
+++ b/installerbuilder/common/repositorygen.cpp
@@ -458,11 +458,12 @@ void QInstaller::generateMetaDataDirectory(const QString& metapath_, const QStri
const QString script = package.firstChildElement("Script").text();
if (!script.isEmpty()) {
verbose() << " Copying associated script " << script << " into the meta package...";
- if (!QFile::copy(QString::fromLatin1("%1/meta/%2").arg(it->directory, script),
- QString::fromLatin1("%1/%2/%3").arg(metapath, it->name, script))) {
+ QString fromLocation(QString::fromLatin1("%1/meta/%2").arg(it->directory, script));
+ QString toLocation(QString::fromLatin1("%1/%2/%3").arg(metapath, it->name, script));
+ if (!QFile::copy(fromLocation, toLocation)) {
verbose() << "failed!" << std::endl;
- throw Error(QObject::tr("Could not copy the scriot %1 to its target location (%2)")
- .arg(script, it->name));
+ throw Error(QObject::tr("Could not copy the script (%1) to its target location (%2)")
+ .arg(fromLocation, toLocation));
} else {
verbose() << std::endl;
}