From 8b5c411de0779a80ed341331077d42a53f099ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= <baris@pardus.org.tr>
Date: Thu, 7 Jul 2005 13:10:57 +0000
Subject: [PATCH] =?UTF-8?q?=C5=9Fimdi=20(en=20az=C4=B1ndan)=20=C3=A7al?=
 =?UTF-8?q?=C4=B1=C5=9F=C4=B1yor.=20Di=C4=9Fer=20b=C3=B6l=C3=BCmleri=20yal?=
 =?UTF-8?q?n=C4=B1zca=20comment-out=20ettim.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pisi-cli | 56 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 22 deletions(-)

diff --git a/pisi-cli b/pisi-cli
index ae374f9d..72870657 100755
--- a/pisi-cli
+++ b/pisi-cli
@@ -22,21 +22,21 @@ Use \"%prog help <command>\" for help on a specific subcommand.
 PISI Package Manager
 """
 
-def commonopts(parser):
-    parser.add_option("-D", "--destdir", action="store")
-    parser.add_option("-u", "--username", action="store")
-    parser.add_option("-p", "--password", action="store")
-    parser.add_option("-P", action="store_true", dest="getpass", default=False,
-                      help="Get password from the command line")
-    parser.add_option("-v", "--verbose", action="store_true",
-                      dest="verbose", default=False,
-                      help="detailed output")
-    parser.add_option("-d", "--debug", action="store_true",
-                      default=True, help="show debugging information")
-    parser.add_option("-n", "--dry-run", action="store_true", default=False,
-                      help = "do not perform any action, just show what\
-                      would be done")
-    return parser
+# def commonopts(parser):
+#     parser.add_option("-D", "--destdir", action="store")
+#     parser.add_option("-u", "--username", action="store")
+#     parser.add_option("-p", "--password", action="store")
+#     parser.add_option("-P", action="store_true", dest="getpass", default=False,
+#                       help="Get password from the command line")
+#     parser.add_option("-v", "--verbose", action="store_true",
+#                       dest="verbose", default=False,
+#                       help="detailed output")
+#     parser.add_option("-d", "--debug", action="store_true",
+#                       default=True, help="show debugging information")
+#     parser.add_option("-n", "--dry-run", action="store_true", default=False,
+#                       help = "do not perform any action, just show what\
+#                       would be done")
+#     return parser
 
 
 class ParserError:
@@ -60,14 +60,27 @@ class PisiCLI(object):
         # first construct a parser for common options
         # this is really dummy
         parser = Parser(usage=usage, version="%prog " + pisi.__version__)
-        parser.allow_interspersed_args = False
-        parser = commonopts(parser)
+#        parser.allow_interspersed_args = False
+#        parser = commonopts(parser)
+        parser.add_option("-D", "--destdir", action="store")
+        parser.add_option("-u", "--username", action="store")
+        parser.add_option("-p", "--password", action="store")
+        parser.add_option("-P", action="store_true", dest="getpass", default=False,
+                          help="Get password from the command line")
+        parser.add_option("-v", "--verbose", action="store_true",
+                          dest="verbose", default=False,
+                          help="detailed output")
+        parser.add_option("-d", "--debug", action="store_true",
+                          default=True, help="show debugging information")
+        parser.add_option("-n", "--dry-run", action="store_true", default=False,
+                          help = "do not perform any action, just show what\
+                          would be done")
 
         self.command = ""
         try:
             (options, args) = parser.parse_args()
-            if len(parser.rargs)==0:
-                self.die()
+#            if len(parser.rargs)==0:
+#                self.die()
             self.command = args[0]
         except ParserError:
             # fully expected :) let's see if we got an argument
@@ -81,10 +94,9 @@ class PisiCLI(object):
 #         parser.allow_interspersed_args = False
 #         self.parser = commonopts(parser)    
 #         self.add_subcommand_opts()
-#         (self.options, args) = sel
-#         f.parser.parse_args()
+#         (self.options, args) = self.parser.parse_args()
         self.args = args[1:]
-        print options
+        self.options = options
 
         self.authInfo = None
         self.checkAuthInfo()