Major bugfixes to do-release-upgrade code

src/aptmanager.cpp

@@ -144,14 +144,15 @@ void AptManager::handleUpdateProcessBuffer()
                     conffileList.append(confLine);
                 }
             }
-        } else if (line == "Lubuntu Update !!! NEW RELEASE") {
-            // Same busy-wait technique, but here we're just getting one extra line, the model code.
+        } else if (line == "Lubuntu Update !!! NEW RELEASE\r\n") {
+            // Same busy-wait technique, but here we're just getting one extra line, the release code.
             while (!aptProcess->canReadLine()) {
                 QThread::msleep(20);
             }
             aptProcess->readLine(lineBuf, 2048);
-            QString ltsReleaseCode = QString(lineBuf);
-            emit newLtsRelease(ltsReleaseCode);
+            QString releaseCode = QString(lineBuf);
+	    releaseCode = releaseCode.left(releaseCode.count() - 2);
+            emit newRelease(releaseCode);
         }
 
         double percentageDone = (static_cast<double>(internalUpdateProgress) / (((internalUpdateInfo[0].count() + internalUpdateInfo[1].count()) * 4) + internalUpdateInfo[2].count())) * 100;

src/aptmanager.h

@@ -28,8 +28,7 @@ signals:
     void progressUpdated(int progress);
     void logLineReady(QString logLine);
     void conffileListReady(QStringList conffileList);
-    void newLtsRelease(QString code);
-    void newStableRelease(QString code);
+    void newRelease(QString code);
 
 private slots:
     void handleUpdateProcessBuffer();

src/lubuntu-update-backend

@@ -69,11 +69,13 @@ elif [ "$1" = 'doupdate' ]; then
 	DEBIAN_FRONTEND='kde' apt-get -o Dpkg::Options::='--force-confdef' -o Dpkg::Options::='--force-confold' -o Apt::Color='0' -o Dpkg::Use-Pty='0' -y dist-upgrade |& tee /run/lubuntu-update-apt-log
 
 	# Find all the conffiles
+	doConffiles='y';
 	mapfile conffileRawList <<< "$(grep -P "^Configuration file \'.*\'$" '/run/lubuntu-update-apt-log')"
 	if [ "$(echo "${conffileRawList[0]}" | head -c1)" != 'C' ]; then # Empty or invalid list, we're done
-		exit 0
+		doConffiles='n';
 	fi
 
+	if [ "$doConffiles" = 'y' ]; then
 		conffileList=()
 		counter=0
 		while [ "$counter" -lt "${#conffileRawList[@]}" ]; do
@@ -126,6 +128,7 @@ elif [ "$1" = 'doupdate' ]; then
 				gotCommand='no'
 			fi
 		done
+	fi
 
 	echo 'Checking release status...'
 
@@ -133,36 +136,52 @@ elif [ "$1" = 'doupdate' ]; then
 	releaseYear="$(cut -d'.' -f1 <<< "$releaseCode")";
 	releaseMonth="$(cut -d'.' -f2 <<< "$releaseCode")";
 	metaReleaseData="$(curl https://changelogs.ubuntu.com/meta-release)";
-	nextReleaseMonth='';
-	nextReleaseYear='';
-	nextLTSReleaseMonth='';
-	nextLTSReleaseYear='';
+	#nextReleaseMonth='';
+	#nextReleaseYear='';
+	#nextLTSReleaseMonth='';
+	#nextLTSReleaseYear='';
 
+	while true; do
 		if ((releaseMonth == 4)); then
-		nextReleaseMonth=((releaseMonth + 6));
-		nextReleaseYear="$releaseYear";
-		if (((releaseYear % 2) == 0)); then
-			nextLTSReleaseMonth='04';
-			nextLTSReleaseYear=((releaseYear + 2));
-		fi
+			releaseMonth='10';
 		else
-		nextReleaseMonth="$releaseMonth";
-		nextReleaseYear=((releaseYear + 1));
+			releaseMonth='04';
+			((releaseYear++));
 		fi
-
-	if [ -n "$nextLTSReleaseYear" ]; then
-		if isReleaseSupported "$nextLTSReleaseYear" "$nextLTSReleaseMonth" "$metaReleaseData"; then
+		if isReleaseSupported "$releaseYear" "$releaseMonth" "$metaReleaseData"; then
 			echo 'Lubuntu Update !!! NEW RELEASE';
-			echo "$nextLTSReleaseYear.$nextLTSReleaseMonth";
-		fi
+			echo "$releaseYear.$releaseMonth";
+			break;
 		fi
+	done
 
-	if ! (((nextReleaseYear == nextLTSReleaseYear) && (nextReleaseMonth == nextLTSReleaseMonth))); then
-		if isReleaseSupported "$nextReleaseYear" "$nextReleaseMonth" "$metaReleaseData"; then
-			echo 'Lubuntu Update !!! NEW RELEASE';
-			echo "$nextReleaseYear.$nextReleaseMonth";
-		fi
-	fi
+#	if ((releaseMonth == 4)); then
+#		nextReleaseMonth=$((releaseMonth + 6));
+#		nextReleaseYear="$releaseYear";
+#		if (((releaseYear % 2) == 0)); then
+#			nextLTSReleaseMonth='04';
+#			nextLTSReleaseYear=$((releaseYear + 2));
+#		fi
+#	else
+#		nextReleaseMonth="$releaseMonth";
+#		nextReleaseYear=$((releaseYear + 1));
+#	fi
+#
+#	if [ -n "$nextLTSReleaseYear" ]; then
+#		if isReleaseSupported "$nextLTSReleaseYear" "$nextLTSReleaseMonth" "$metaReleaseData"; then
+#			echo 'Lubuntu Update !!! NEW RELEASE';
+#			echo "$nextLTSReleaseYear.$nextLTSReleaseMonth";
+#		fi
+#	fi
+#
+#	if ! (((nextReleaseYear == nextLTSReleaseYear) && (nextReleaseMonth == nextLTSReleaseMonth))); then
+#		if isReleaseSupported "$nextReleaseYear" "$nextReleaseMonth" "$metaReleaseData"; then
+#			echo 'Lubuntu Update !!! NEW RELEASE';
+#			echo "$nextReleaseYear.$nextReleaseMonth";
+#		else
+#			echo "Unsupported release: $nextReleaseYear.$nextReleaseMonth";
+#		fi
+#	fi
 
 	echo 'Update installation complete.'
 elif [ "$1" = 'doReleaseUpgrade' ]; then

src/mainwindow.cpp

@@ -25,7 +25,7 @@ MainWindow::MainWindow(QWidget *parent)
     connect(aptManager, &AptManager::progressUpdated, this, &MainWindow::onProgressUpdate);
     connect(aptManager, &AptManager::logLineReady, this, &MainWindow::onLogLineReady);
     connect(aptManager, &AptManager::conffileListReady, this, &MainWindow::onConffileListReady);
-    connect(aptManager, &AptManager::newLtsRelease, this, &MainWindow::onNewRelease);
+    connect(aptManager, &AptManager::newRelease, this, &MainWindow::onNewRelease);
 }
 
 MainWindow::~MainWindow()
@@ -144,7 +144,9 @@ void MainWindow::onUpdateCompleted()
     ui->progressBar->setVisible(false);
     ui->statLabel->setText(tr("Update installation complete."));
     emit updatesInstalled(); // this tells the orchestrator to hide the tray icon
+    if (releaseCodes.count() > 0) {
         handleNewReleases();
+    }
 }
 
 void MainWindow::onCheckUpdatesCompleted()

src/orchestrator.cpp

@@ -26,7 +26,7 @@ Orchestrator::Orchestrator(QObject *parent)
     bool success = configFile.open(QFile::ReadOnly);
     if (success) {
         char lineBuf[2048];
-        while (configFile.canReadLine()) {
+        while (!configFile.atEnd()) {
             configFile.readLine(lineBuf, 2048);
             QString line(lineBuf);
             line = line.trimmed();
@@ -107,7 +107,7 @@ void Orchestrator::onNewReleaseAvailable(QStringList releaseCodes)
     QString druType;
     if (success) {
         char lineBuf[2048];
-        while (druTypeFile.canReadLine()) {
+        while (!druTypeFile.atEnd()) {
             druTypeFile.readLine(lineBuf, 2048);
             QString line(lineBuf);
             line = line.trimmed();
@@ -125,6 +125,9 @@ void Orchestrator::onNewReleaseAvailable(QStringList releaseCodes)
                 break;
             }
         }
+    } else {
+        druType="normal";
+        druTypeFile.close();
     }
 
     for (int i = 0;i < releaseCodes.count();i++) {