From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 7 May 2011 13:49:51 +0000 (+0200)
Subject: implement correct error reporting
X-Git-Tag: 0.9.0~91^2~11^2~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/ebfeeaedf5bc357170cae971c0f6a1458ff65f65

implement correct error reporting
---

diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index d604110ef..7ece92d2e 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -256,6 +256,11 @@ bool EDSP::ReadResponse(int const input, pkgDepCache &Cache) {
 			else
 				std::clog << msg << std::endl;
 			continue;
+		} else if (section.Exists("Error") == true) {
+			std::cerr << "The solver encountered an error of type: " << section.FindS("Error") << std::endl;
+			std::cerr << "The following information might help you to understand what is wrong:" << std::endl;
+			std::cerr << SubstVar(SubstVar(section.FindS("Message"), "\n .\n", "\n\n"), "\n ", "\n") << std::endl << std::endl;
+			break;
 		} else if (section.Exists("Autoremove") == true)
 			type = "Autoremove";
 		else
@@ -457,8 +462,13 @@ bool EDSP::WriteProgress(unsigned short const percent, const char* const message
 	return true;
 }
 									/*}}}*/
-bool EDSP::WriteError(std::string const &message, FILE* output) { return false; }
-
+// EDSP::WriteError - format an error message to be send to file descriptor /*{{{*/
+bool EDSP::WriteError(char const * const uuid, std::string const &message, FILE* output) {
+	fprintf(output, "Error: %s\n", uuid);
+	fprintf(output, "Message: %s\n\n", SubstVar(SubstVar(message, "\n\n", "\n.\n"), "\n", "\n ").c_str());
+	return true;
+}
+									/*}}}*/
 // EDSP::ExecuteSolver - fork requested solver and setup ipc pipes	{{{*/
 bool EDSP::ExecuteSolver(const char* const solver, int *solver_in, int *solver_out) {
 	std::vector<std::string> const solverDirs = _config->FindVector("Dir::Bin::Solvers");
diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h
index 98a70d7f6..210188d03 100644
--- a/apt-pkg/edsp.h
+++ b/apt-pkg/edsp.h
@@ -171,8 +171,13 @@ public:
 	 *
 	 *  The first line of the message should be a short description
 	 *  of the error so it can be used for dialog titles or alike
+	 *
+	 *  \param uuid of this error message
+	 *  \param message is free form text to discribe the error
+	 *  \param output the front-end listens for error messages
 	 */
-	bool static WriteError(std::string const &message, FILE* output);
+	bool static WriteError(char const * const uuid, std::string const &message, FILE* output);
+
 
 	/** \brief executes the given solver and returns the pipe ends
 	 *
diff --git a/cmdline/apt-dump-solver.cc b/cmdline/apt-dump-solver.cc
index 5bcfe4f06..dab0cc6fd 100644
--- a/cmdline/apt-dump-solver.cc
+++ b/cmdline/apt-dump-solver.cc
@@ -46,5 +46,5 @@ int main(int argc,const char *argv[])					/*{{{*/
 	fclose(output);
 	fclose(input);
 
-	EDSP::WriteError("I am too dumb, i can just dump!", stdout);
+	EDSP::WriteError("ERR_JUST_DUMPING", "I am too dumb, i can just dump!\nPlease use one of my friends instead!", stdout);
 }
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index df6a6f569..ad00a0e23 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -158,16 +158,16 @@ int main(int argc,const char *argv[])					/*{{{*/
 
 	if (upgrade == true) {
 		if (pkgAllUpgrade(CacheFile) == false) {
-			EDSP::WriteError("An upgrade error occured", output);
+			EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occured", output);
 			return 0;
 		}
 	} else if (distUpgrade == true) {
 		if (pkgDistUpgrade(CacheFile) == false) {
-			EDSP::WriteError("An dist-upgrade error occured", output);
+			EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occured", output);
 			return 0;
 		}
 	} else if (Fix.Resolve() == false) {
-		EDSP::WriteError("An error occured", output);
+		EDSP::WriteError("ERR_UNSOLVABLE", "An error occured", output);
 		return 0;
 	}