* apt-pkg/deb/dpkgpm.cc:

  - if available store the Commandline in the history
* apt-pkg/contrib/cmndline.cc:
  - save Commandline in Commandline::AsString for logging

2 files changed, 45 insertions, 0 deletions

diff --git a/test/libapt/commandlineasstring_test.cc b/test/libapt/commandlineasstring_test.cc
new file mode 100644
index 000000000..a38957d7e
--- /dev/null
+++ b/test/libapt/commandlineasstring_test.cc
@@ -0,0 +1,39 @@
+#include <apt-pkg/cmndline.h>
+#include <apt-pkg/configuration.h>
+
+#include <string>
+
+#include "assert.h"
+
+class CLT: public CommandLine {
+
+	public:
+	std::string static AsString(const char * const * const argv,
+				    unsigned int const argc) {
+		std::string const static conf = "Commandline::AsString";
+		_config->Clear(conf);
+		SaveInConfig(argc, argv);
+		return _config->Find(conf);
+	}
+};
+
+#define CMD(y,z) equals(CLT::AsString(argv, y), z);
+
+int main() {
+	{
+		const char* const argv[] = {"apt-get", "install", "-sf"};
+		CMD(3, "apt-get install -sf");
+	}
+	{
+		const char* const argv[] = {"apt-cache", "-s", "apt", "-so", "Debug::test=Test"};
+		CMD(5, "apt-cache -s apt -so Debug::test=Test");
+	}
+	{
+		const char* const argv[] = {"apt-cache", "-s", "apt", "-so", "Debug::test=Das ist ein Test"};
+		CMD(5, "apt-cache -s apt -so Debug::test=\"Das ist ein Test\"");
+	}
+	{
+		const char* const argv[] = {"apt-cache", "-s", "apt", "--hallo", "test=1.0"};
+		CMD(5, "apt-cache -s apt --hallo test=1.0");
+	}
+}
diff --git a/test/libapt/makefile b/test/libapt/makefile
index 08f581e6d..cb76d5ee6 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -23,3 +23,9 @@ PROGRAM = GetListOfFilesInDir${BASENAME}
 SLIBS = -lapt-pkg
 SOURCE = getlistoffilesindir_test.cc
 include $(PROGRAM_H)
+
+# Program for testing CommandLine reconstruction
+PROGRAM = commandlineasstring${BASENAME}
+SLIBS = -lapt-pkg
+SOURCE = commandlineasstring_test.cc
+include $(PROGRAM_H)