From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 8 Sep 2010 20:45:52 +0000 (+0200)
Subject: naoki: Remove export of data to the wiki.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0123789cd6dbd7445b7332807ffe3f0587e01a5b;p=ipfire-3.x.git

naoki: Remove export of data to the wiki.
---

diff --git a/naoki/__init__.py b/naoki/__init__.py
index d77e9435c..8c02d4a6a 100644
--- a/naoki/__init__.py
+++ b/naoki/__init__.py
@@ -85,22 +85,6 @@ class Naoki(object):
 
 	def call_package_info(self, args):
 		for package in backend.parse_package_info(args.packages):
-			if args.wiki:
-				print package.fmtstr("""\
-====== %(name)s ======
-| **Version:**  | %(version)s  |
-| **Release:**  | %(release)s  |
-| **Group:**  | %(group)s  |
-| **License:**  | %(license)s  |
-| **Maintainer:**  | %(maintainer)s |
-| **Dependencies:** | %(deps)s |
-| **Build dependencies:** | %(build_deps)s |
-| %(summary)s ||
-| %(description)s ||
-| **Website:**  | %(url)s  |
-""")
-				continue
-
 			if args.long:
 				print package.fmtstr("""\
 --------------------------------------------------------------------------------
@@ -152,18 +136,7 @@ Release       : %(release)s
 
 	def call_package_groups(self, args):
 		groups = backend.get_group_names()
-		if args.wiki:
-			print "====== All available groups of packages ======"
-			for group in groups:
-				print "===== %s =====" % group
-				for package in backend.parse_package_info(backend.get_package_names()):
-					if not package.group == group:
-						continue
-
-					print package.fmtstr("  * [[.package:%(name)s|%(name)s]] - %(summary)s")
-
-		else:
-			print "\n".join(groups)
+		print "\n".join(groups)
 
 	def call_source(self, args):
 		if not args.has_key("action"):
diff --git a/naoki/terminal.py b/naoki/terminal.py
index ca794fff9..f0fc67a37 100644
--- a/naoki/terminal.py
+++ b/naoki/terminal.py
@@ -297,7 +297,6 @@ class Commandline(object):
 							arguments=[
 								Option("long", ["-l", "--long"], help="Show long list of information"),
 								Option("machine", ["--machine"], help="Output in machine parseable format"),
-								Option("wiki", ["--wiki"], help="Output in wiki format"),
 								List("packages"),
 							]),
 						Parser("tree", help="Show package tree"),
@@ -310,9 +309,7 @@ class Commandline(object):
 							]),
 						Parser("groups",
 							help="Show package groups",
-							arguments=[
-								Option("wiki", ["--wiki"], help="Output in wiki format"),
-							]),
+							),
 					]),
 
 				# Source