ignore upgrades to pinned packages and warn about install/remove

[fapman] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 036d6ee..ddebc48 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -351,7 +351,8 @@ void MainWindow::operationQueueFinished(QList<AAptInterface::interfaceMode> last
                if( inst.count()>0 )
                        pkglist += QString("Total download size: %L1 kB<br>").arg(total_dl_size);
                bool mismatch = false;
-               bool warn_system_package = false;
+               bool warn_system_package_remove = false;
+               bool warn_system_package_install = false;
 
                if( remv.count()>0 ) {
                        pkglist += "<br><b><u>REMOVE:</u></b><br><font size=\"-1\">";
@@ -365,7 +366,7 @@ void MainWindow::operationQueueFinished(QList<AAptInterface::interfaceMode> last
                                }
 #ifdef Q_WS_MAEMO_5
                                if( pkg && pkg->maemoDisplayName()=="Maemo 5" ) {
-                                       warn_system_package = true;
+                                       warn_system_package_remove = true;
                                }
 #endif
                                if( remvver.count()>i ) {
@@ -401,7 +402,7 @@ void MainWindow::operationQueueFinished(QList<AAptInterface::interfaceMode> last
                                }
 #ifdef Q_WS_MAEMO_5
                                if( pkg && pkg->maemoDisplayName()=="Maemo 5" ) {
-                                       warn_system_package = true;
+                                       warn_system_package_install = true;
                                }
 #endif
                                if( instver.count()>i ) {
@@ -431,10 +432,15 @@ void MainWindow::operationQueueFinished(QList<AAptInterface::interfaceMode> last
                        b.setText("Warning","Blacklisted package(s) will be installed");
                        b.exec();
                }
-               if( warn_system_package ) {
+               if( warn_system_package_remove ) {
                        ConfirmDialog s(false, this);
-                       s.setText("Warning","You are trying to perform an operation on a critical system package. This is an operation which has not been tested and " \
-                                         "it is unknown whether it will succeed or result in a horrible failure. You have been warned.");
+                       s.setText("Warning","You are about to remove a critical system package.");
+                       s.exec();
+               }
+               if( warn_system_package_install ) {
+                       ConfirmDialog s(false, this);
+                       s.setText("Warning","You are trying to perform an install/upgrade operation on a critical system package. Doing a system upgrade with " \
+                                         "Faster Application Manager has not been tested and it could result in a horrible failure. You have been warned.");
                        s.exec();
                }