[PATCH 2 of 2] merged

[Wald Commits]

# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1398176815 -7200
# Node ID bd26fc6893e311d080f8691b786dbd087c8c70ab
# Parent  a7163018de2f40d42f0a587aafc12775a4f3653f
# Parent  c88090a15ae4aeb689df8d6fa230bea93fe79d72
merged.

diff -r a7163018de2f -r bd26fc6893e3 cinst/nssstore_linux.c
--- a/cinst/nssstore_linux.c	Tue Apr 22 16:26:16 2014 +0200
+++ b/cinst/nssstore_linux.c	Tue Apr 22 16:26:55 2014 +0200
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <errno.h>
 
 #include "nssstore.h"
 #include "logging.h"
@@ -187,7 +188,7 @@
     {
       if (fprintf (stream, "I:%s\n", to_install[i]) <= 3)
         {
-          ERRORPRINTF ("Write failed \n");
+          ERRORPRINTF ("Write failed: %s \n", strerror(errno));
           goto done;
         }
     }
@@ -196,7 +197,7 @@
     {
       if (fprintf (stream, "R:%s\n", to_remove[i]) <= 3)
         {
-          ERRORPRINTF ("Write failed \n");
+          ERRORPRINTF ("Write failed: %s \n", strerror(errno));
           goto done;
         }
     }
diff -r a7163018de2f -r bd26fc6893e3 ui/tests/cinstprocesstest.cpp
--- a/ui/tests/cinstprocesstest.cpp	Tue Apr 22 16:26:16 2014 +0200
+++ b/ui/tests/cinstprocesstest.cpp	Tue Apr 22 16:26:55 2014 +0200
@@ -69,7 +69,7 @@
     }
     instructions.close();
 
-    args << "instructions=" + instructions.fileName();
+    args << "choices=" + instructions.fileName();
 
     QProcess* installerProcess = startCinstProcess(args);
     finishVerify(installerProcess, ERR_NO_ERROR);
@@ -137,7 +137,7 @@
     }
     instructions.close();
 
-    args << "instructions=" + instructions.fileName();
+    args << "choices=" + instructions.fileName();
 
     QProcess* installerProcess = startCinstProcess(args);
     finishVerify(installerProcess, ERR_INVALID_INPUT_NO_LIST);
@@ -157,7 +157,7 @@
     }
     instructions.close();
 
-    args << "instructions=" + instructions.fileName();
+    args << "choices=" + instructions.fileName();
 
     QProcess* installerProcess = startCinstProcess(args);
     /* If the following failed there may be leftovers in /tmp */
@@ -168,7 +168,7 @@
 void CinstProcessTest::testNoInput() {
     QStringList args;
     args << "list=foobazbuf";
-    args << "instructions=bazbuffoo";
+    args << "choices=bazbuffoo";
     QProcess* installerProcess;
     installerProcess = startCinstProcess(args);
     finishVerify(installerProcess, ERR_INVALID_INPUT_NO_LIST);
@@ -183,7 +183,7 @@
 
     QStringList args;
     args << "list=" + validListFile.fileName();
-    args << "instructions=" + emptyFile.fileName();
+    args << "choices=" + emptyFile.fileName();
 
     QProcess* installerProcess = startCinstProcess(args);
     finishVerify(installerProcess, ERR_NO_INSTRUCTIONS);
@@ -202,7 +202,7 @@
     instructions.write("I:ABCDEF\n");
     instructions.close();
 
-    args << "instructions=" + instructions.fileName();
+    args << "choices=" + instructions.fileName();
 
     QProcess* installerProcess = startCinstProcess(args);
 
@@ -212,7 +212,7 @@
 void CinstProcessTest::testUninstall() {
     QStringList args;
     args << "list=" + validListFile.fileName();
-    args << "instructions=uninstall";
+    args << "choices=uninstall";
 
     QProcess* installerProcess = startCinstProcess(args);