1 files changed, 8 insertions, 10 deletions

diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp
index 2d16fa720..922bdfe30 100644
--- a/tools/repogen/repogen.cpp
+++ b/tools/repogen/repogen.cpp
@@ -69,12 +69,10 @@ static void printUsage()
     std::cout << "  -v|--verbose              Verbose output" << std::endl;
 
     std::cout << "  --unite-metadata          Combine all metadata into one 7z. This speeds up metadata " << std::endl;
-    std::cout << "                            download phase. Creates also metadata 7z per component for " << std::endl;
-    std::cout << "                            backward compatibility." << std::endl;
-
-    std::cout << "  --unite-metadata-only     Combine all metadata into one 7z. This speeds up metadata " << std::endl;
     std::cout << "                            download phase." << std::endl;
 
+    std::cout << "  --component-metadata      Creates one metadata 7z per component. " << std::endl;
+
     std::cout << std::endl;
     std::cout << "Example:" << std::endl;
     std::cout << "  " << appName << " -p ../examples/packages repository/"
@@ -106,8 +104,8 @@ int main(int argc, char** argv)
         QInstallerTools::FilterType filterType = QInstallerTools::Exclude;
         bool remove = false;
         bool updateExistingRepositoryWithNewComponents = false;
-        bool createUnitedMetadata = false;
-        bool createOnlyUnitedMetadata = false;
+        bool createUnifiedMetadata = true;
+        bool createComponentMetadata = true;
 
         //TODO: use a for loop without removing values from args like it is in binarycreator.cpp
         //for (QStringList::const_iterator it = args.begin(); it != args.end(); ++it) {
@@ -186,10 +184,10 @@ int main(int argc, char** argv)
                 remove = true;
                 args.removeFirst();
             } else if (args.first() == QLatin1String("--unite-metadata")) {
-                createUnitedMetadata = true;
+                createComponentMetadata = false;
                 args.removeFirst();
-            } else if (args.first() == QLatin1String("--unite-metadata-only")) {
-                createOnlyUnitedMetadata = true;
+            } else if (args.first() == QLatin1String("--component-metadata")) {
+                createUnifiedMetadata = false;
                 args.removeFirst();
             }
             else {
@@ -298,7 +296,7 @@ int main(int argc, char** argv)
         QInstallerTools::copyMetaData(tmpMetaDir, repositoryDir, packages, QLatin1String("{AnyApplication}"),
             QLatin1String(QUOTE(IFW_REPOSITORY_FORMAT_VERSION)));
         QInstallerTools::compressMetaDirectories(tmpMetaDir, tmpMetaDir, pathToVersionMapping,
-                                                 createUnitedMetadata, createOnlyUnitedMetadata);
+                                                 createComponentMetadata, createUnifiedMetadata);
 
         QDirIterator it(repositoryDir, QStringList(QLatin1String("Updates*.xml")), QDir::Files | QDir::CaseSensitive);
         while (it.hasNext()) {