[yum-cvs] yum shell.py,1.36,1.37 utils.py,1.2,1.3

[Seth Vidal]

Update of /home/groups/yum/cvs/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv26691

Modified Files:
	shell.py utils.py 
Log Message:

more deprecation clean ups.


Index: shell.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/shell.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- shell.py	20 Dec 2006 00:04:51 -0000	1.36
+++ shell.py	22 Feb 2007 22:43:09 -0000	1.37
@@ -160,8 +160,6 @@
         
         elif cmd == 'reset':
             self.base.closeRpmDB()
-            self.base.doTsSetup()
-            self.base.doRpmDBSetup()
         
         elif cmd == 'solve':
             try:
@@ -235,8 +233,6 @@
                 self.base.up = None         # reset the updates
                 # reset the transaction set, we have to or we shall surely die!
                 self.base.closeRpmDB() 
-                self.base.doTsSetup()
-                self.base.doRpmDBSetup()
         else:
             self.do_help('config')
 
@@ -273,7 +269,7 @@
                 else:
                     for repo in changed:
                         try:
-                            self.base.doRepoSetup(thisrepo=repo)
+                            self.base._getRepos(thisrepo=repo)
                         except Errors.RepoError, e:
                             self.logger.critical('Disabling Repository')
                             self.base.repos.disableRepo(repo)
@@ -298,8 +294,6 @@
                     self.base.up = None     # reset the updates
                     # reset the transaction set and refresh everything
                     self.base.closeRpmDB() 
-                    self.base.doTsSetup()
-                    self.base.doRpmDBSetup()
         
         else:
             self.do_help('repo')
@@ -334,7 +328,5 @@
                     self.verbose_logger.log(logginglevels.INFO_2,
                         'Finished Transaction')
                     self.base.closeRpmDB()
-                    self.base.doTsSetup()
-                    self.base.doRpmDBSetup()
 
 

Index: utils.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/utils.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- utils.py	6 Feb 2007 15:13:15 -0000	1.2
+++ utils.py	22 Feb 2007 22:43:09 -0000	1.3
@@ -44,7 +44,7 @@
         root = self._parser.getRoot(opts)
         # Read up configuration options and initialise plugins
         try:
-            self.doConfigSetup(opts.conffile, root, 
+            self._getConfig(opts.conffile, root, 
                     init_plugins=not opts.noplugins,
                     plugin_types= pluginsTypes,
                     optparser=self._parser,
@@ -69,11 +69,12 @@
     def doUtilYumSetup(self):
         """do a default setup for all the normal/necessary yum components,
            really just a shorthand for testing"""
+        # FIXME - we need another way to do this, I think.
         try:
-            self.doTsSetup()
-            self.doRpmDBSetup()
-            self.doRepoSetup()
-            self.doSackSetup()
+            self._getTs()
+            self._getRpmDB()
+            self._getRepos()
+            self._getSacks()
         except yum.Errors.YumBaseError, msg:
             self.logger.critical(str(msg))
             sys.exit(1)