Allow user URLs in ssu.ini, overriding URLs from repos.ini

sailfishos · Oct 21, 2012 · b1410bd · b1410bd
1 parent cdad8ad
commit b1410bd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/libssu/ssu.cpp b/libssu/ssu.cpp
@@ -224,14 +224,18 @@ QString Ssu::repoUrl(QString repoName, bool rndRepo, QHash<QString, QString> rep
   repoParameters.insert("adaptation", settings->value("adaptation").toString());
   repoParameters.insert("deviceFamily", deviceFamily());
 
-  foreach (const QString &section, configSections){
-    repoSettings->beginGroup(section);
-    if (repoSettings->contains(repoName)){
-      r = repoSettings->value(repoName).toString();
+  if (settings->contains("repository-urls/" + repoName))
+    r = settings->value("repository-urls/" + repoName).toString();
+  else {
+    foreach (const QString &section, configSections){
+      repoSettings->beginGroup(section);
+      if (repoSettings->contains(repoName)){
+        r = repoSettings->value(repoName).toString();
+        repoSettings->endGroup();
+        break;
+      }
       repoSettings->endGroup();
-      break;
     }
-    repoSettings->endGroup();
   }
 
   QHashIterator<QString, QString> i(repoParameters);

diff --git a/ssu.ini b/ssu.ini
@@ -9,3 +9,9 @@ ca-certificate=
 credentials-url=https://example.com/ssu/device/%1/credentials.xml
 register-url=https://example.com/ssu/device/%1/register.xml
 credentials-scope=example
+
+[repository-urls]
+sample-url=http://example.com/repository/%(example)/
+
+[repository-url-variables]
+example=bunny