[yum-cvs] yum cli.py,1.171,1.172

[Menno Smits]

Update of /home/groups/yum/cvs/yum
In directory login:/tmp/cvs-serv13326

Modified Files:
	cli.py 
Log Message:
Moved __version__ to yum/__init__.py
Added getYumVersion() to PluginConduit


Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- cli.py	26 Mar 2005 07:54:14 -0000	1.171
+++ cli.py	27 Mar 2005 07:31:16 -0000	1.172
@@ -43,8 +43,6 @@
 import urlgrabber
 import urlgrabber.grabber
 
-__version__ = '2.3.1'
-
 class CliError(yum.Errors.YumBaseError):
    def __init__(self, args=None):
         yum.Errors.YumBaseError.__init__(self)
@@ -136,7 +134,7 @@
         try: 
             for o,a in gopts:
                 if o == '--version':
-                    print __version__
+                    print yum.__version__
                     sys.exit(0)
                 if o == '--installroot':
                     installroot = a
@@ -164,7 +162,7 @@
             self.conf.setConfigOption('uid', os.geteuid())
 
             # version of yum
-            self.conf.setConfigOption('yumversion', __version__)
+            self.conf.setConfigOption('yumversion', yum.__version__)
             
             
             # we'd like to have a log object now