summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Jenssen <tim.jenssen@digia.com>2014-02-04 16:10:03 +0100
committerTim Jenssen <tim.jenssen@digia.com>2014-05-05 15:45:16 +0200
commit5c913c8f19913e607183fc4faf16dcad08452412 (patch)
treebb9288994732241f4a2959633c3b037951face83
parent19e4bb1f7da9afafff904b5216fbda673736d0de (diff)
fix that package.xml files are not or wrongly generated
Change-Id: I22b2e9da8d9a8658fec6b5c4976fe2135c2b04f8 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
-rw-r--r--tools/getrepositorycontent/main.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/getrepositorycontent/main.cpp b/tools/getrepositorycontent/main.cpp
index 148280e3f..671f07ab0 100644
--- a/tools/getrepositorycontent/main.cpp
+++ b/tools/getrepositorycontent/main.cpp
@@ -394,13 +394,11 @@ int main(int argc, char *argv[])
QHashIterator<QString, ComponentData> itComponentData(componentDataHash);
while (itComponentData.hasNext()) {
itComponentData.next();
- if (itComponentData.value().m_script.isEmpty())
- continue;
QString componentScript = QFileInfo(QString::fromLatin1("%1/%2/meta/%3").arg(
packageDirectoryTarget, itComponentData.key(), itComponentData.value().m_script)).absoluteFilePath();
- QString packagesXml = QFileInfo(QString::fromLatin1("%1/%2/meta/packages.xml").arg(
+ QString packagesXml = QFileInfo(QString::fromLatin1("%1/%2/meta/package.xml").arg(
packageDirectoryTarget, itComponentData.key())).absoluteFilePath();
QFile packagesXmlFile(packagesXml);
@@ -428,7 +426,7 @@ int main(int argc, char *argv[])
QDir().mkpath(dataRepositoryPath);
QFile componentScriptFile(componentScript);
- if (!componentScriptFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ if (!itComponentData.value().m_script.isEmpty() && !componentScriptFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
qDebug() << QString::fromLatin1("Can not read %1 %2").arg(componentScript, componentScriptFile.errorString());
continue;
}