From 3fa956b34f725260826ed039425829f4da3be183 Mon Sep 17 00:00:00 2001
From: Bernd Wachter <bernd.wachter@jollamobile.com>
Date: Mon, 1 Apr 2013 23:46:05 +0300
Subject: [PATCH] Do proper rnd/release handling; use lowercase name for
 searching partition files

---
 libssu/ssurepomanager.cpp |  6 +-----
 rpm/ssu.changes           |  4 ++++
 rpm/ssu.spec              |  2 +-
 ssuks/ssukickstarter.cpp  | 24 ++++++++++++++++++------
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/libssu/ssurepomanager.cpp b/libssu/ssurepomanager.cpp
index 686522c..f114500 100644
--- a/libssu/ssurepomanager.cpp
+++ b/libssu/ssurepomanager.cpp
@@ -183,11 +183,7 @@ QString SsuRepoManager::url(QString repoName, bool rndRepo,
   QSettings *repoSettings = new QSettings(SSU_REPO_CONFIGURATION, QSettings::IniFormat);
   SsuDeviceInfo deviceInfo;
 
-  //errorFlag = false;
-
-  settings->sync();
-
-  // fill in all arbitrary variables from ssu.inie
+  // fill in all arbitrary variables from ssu.ini
   var.resolveSection(settings, "repository-url-variables", &repoParameters);
 
   // add/overwrite some of the variables with sane ones
diff --git a/rpm/ssu.changes b/rpm/ssu.changes
index d484fca..285b234 100644
--- a/rpm/ssu.changes
+++ b/rpm/ssu.changes
@@ -1,3 +1,7 @@
+* Mon Apr 01 2013 Bernd Wachter <bernd.wachter@jollamobile.com> - 0.29.1
+- Do proper handling of rnd/release modes
+- Lowercase model names before searching for partition configuration
+
 * Mon Apr 01 2013 Bernd Wachter <bernd.wachter@jollamobile.com> - 0.29
 - Add prototype kickstart generator
 
diff --git a/rpm/ssu.spec b/rpm/ssu.spec
index a8c7a9f..03e70b3 100644
--- a/rpm/ssu.spec
+++ b/rpm/ssu.spec
@@ -1,5 +1,5 @@
 Name: ssu
-Version: 0.29
+Version: 0.29.1
 Release: 1
 Summary: SSU enabler for RND
 Group: System/Base
diff --git a/ssuks/ssukickstarter.cpp b/ssuks/ssukickstarter.cpp
index f7f4582..4e03d4c 100644
--- a/ssuks/ssukickstarter.cpp
+++ b/ssuks/ssukickstarter.cpp
@@ -97,10 +97,10 @@ QStringList SsuKickstarter::partitions(){
 
   QDir dir(QString("%1/kickstart/part/").arg(SSU_DATA_DIR));
 
-  if (dir.exists(deviceInfo.deviceVariant(true)))
-    partitionFile = deviceInfo.deviceVariant(true);
-  else if (dir.exists(deviceModel))
-    partitionFile = deviceModel;
+  if (dir.exists(deviceModel.toLower()))
+    partitionFile = deviceModel.toLower();
+  else if (dir.exists(deviceInfo.deviceVariant(true).toLower()))
+    partitionFile = deviceInfo.deviceVariant(true).toLower();
   else if (dir.exists("default"))
     partitionFile = "default";
   else {
@@ -193,13 +193,25 @@ void SsuKickstarter::write(QString kickstart){
     it++;
   }
 
+  if (repoOverride.contains("rnd")){
+    if (repoOverride.value("rnd") == "true")
+      rndMode = true;
+    else if (repoOverride.value("rnd") == "false")
+      rndMode = false;
+  }
+
+  // in rnd mode both rndRelease an release should be the same,
+  // as the variable name used is %(release)
+  if (rndMode && repoOverride.contains("rndRelease"))
+    repoOverride.insert("release", repoOverride.value("rndRelease"));
+
   kout << commands().join("\n") << endl << endl;
   kout << partitions().join("\n") << endl << endl;
   kout << repos().join("\n") << endl << endl;
   kout << packages().join("\n") << endl << endl;
   kout << scriptletSection("pre", false).join("\n") << endl << endl;
-  kout << scriptletSection("post").join("\n") << endl << endl;
-  kout << scriptletSection("post").join("\n") << endl << endl;
+  kout << scriptletSection("post", true).join("\n") << endl << endl;
+  kout << scriptletSection("post", false).join("\n") << endl << endl;
   // add flags as bitmask?
   // POST, die-on-error
 }