[Debtags-commits] [svn] r1842 - in debtags/1.6.0: . tools

[Enrico Zini]

Author: enrico
Date: Mon Aug 14 15:14:06 2006
New Revision: 1842

Modified:
   debtags/1.6.0/   (props changed)
   debtags/1.6.0/tools/Ept.tcc
   debtags/1.6.0/tools/manpage.cc
Log:
 r3142 at viaza:  enrico | 2006-08-14 16:13:54 +0100
 Builds with new libept


Modified: debtags/1.6.0/tools/Ept.tcc
==============================================================================
--- debtags/1.6.0/tools/Ept.tcc	(original)
+++ debtags/1.6.0/tools/Ept.tcc	Mon Aug 14 15:14:06 2006
@@ -30,12 +30,12 @@
 	if (file == "-")
 	{
 		input::Stdio input(stdin, "<stdin>");
-		textformat::parse(input, ept::t::cache::debtags::stringToEpt<ept::configuration::Apt>(this->packages(), this->vocabulary(), out));
+		textformat::parse(input, ept::t::cache::debtags::stringToEpt<ept::configuration::Apt>(agg, this->vocabulary(), out));
 	}
 	else
 	{
 		input::Stdio input(file);
-		textformat::parse(input, ept::t::cache::debtags::stringToEpt<ept::configuration::Apt>(this->packages(), this->vocabulary(), out));
+		textformat::parse(input, ept::t::cache::debtags::stringToEpt<ept::configuration::Apt>(agg, this->vocabulary(), out));
 	}
 }
 

Modified: debtags/1.6.0/tools/manpage.cc
==============================================================================
--- debtags/1.6.0/tools/manpage.cc	(original)
+++ debtags/1.6.0/tools/manpage.cc	Mon Aug 14 15:14:06 2006
@@ -19,40 +19,40 @@
  */
 
 #include <config.h>
+#include <wibble/commandline/doc.h>
 #include "DebtagsOptions.h"
 #include <iostream>
 
 using namespace std;
-using namespace Tagcoll;
 
 int main(int argc, const char* argv[])
 {
 	try {
 		if (argc == 1)
-			throw commandline::BadOption("no arguments provided");
+			throw wibble::exception::BadOption("no arguments provided");
 
 		string cmd(argv[1]);
 		string hooks(argc > 2 ? argv[2] : "");
 
 		if (cmd == "debtags")
 		{
-			commandline::DebtagsOptions opts;
-			commandline::Manpage help("debtags", VERSION);
+			wibble::commandline::DebtagsOptions opts;
+			wibble::commandline::Manpage help("debtags", VERSION, 1, "enrico at enricozini.org");
 			if (!hooks.empty())
 				help.readHooks(hooks);
-			help.output(cout, opts, 1);
+			help.output(cout, opts);
 		}
 		else
-			throw commandline::BadOption("unknown command " + cmd);
+			throw wibble::exception::BadOption("unknown command " + cmd);
 
 		return 0;
-	} catch (commandline::BadOption& e) {
+	} catch (wibble::exception::BadOption& e) {
 		cerr << e.desc() << endl << endl;
 		cerr << "Usage: manpage <command>" << endl << endl;
 		cerr << "Supported commands are: debtags" << endl;
 		return 1;
-	} catch (Exception& e) {
-		fprintf(stderr, "%s: %.*s\n", e.type(), PFSTR(e.desc()));
+	} catch (std::exception& e) {
+		cerr << e.what() << endl;
 		return 1;
 	}
 }