[yum-cvs] yum/yum transactioninfo.py, 1.20, 1.21 packages.py, 1.37, 1.38

[Seth Vidal]

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

Modified Files:
	transactioninfo.py packages.py 
Log Message:

add state attribute to package objects and update this info in the tsInfo


Index: transactioninfo.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/transactioninfo.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- transactioninfo.py	4 Oct 2005 18:43:44 -0000	1.20
+++ transactioninfo.py	27 Oct 2005 05:32:13 -0000	1.21
@@ -114,6 +114,7 @@
 
     def add(self, txmember):
         """add a package to the transaction"""
+        
         if not self.pkgdict.has_key(txmember.pkgtup):
             self.pkgdict[txmember.pkgtup] = []
         else:
@@ -196,6 +197,7 @@
         txmbr = TransactionMember(po)
         txmbr.current_state = TS_AVAILABLE
         txmbr.output_state = TS_INSTALL
+        txmbr.po.state = TS_INSTALL        
         txmbr.ts_state = 'u'
         txmbr.reason = 'user'
         self.add(txmbr)
@@ -208,6 +210,7 @@
         txmbr = TransactionMember(po)
         txmbr.current_state = TS_AVAILABLE
         txmbr.output_state = TS_TRUEINSTALL
+        txmbr.po.state = TS_INSTALL        
         txmbr.ts_state = 'i'
         txmbr.reason = 'user'
         self.add(txmbr)
@@ -221,6 +224,7 @@
         txmbr = TransactionMember(po)
         txmbr.current_state = TS_INSTALL
         txmbr.output_state = TS_ERASE
+        txmbr.po.state = TS_INSTALL
         txmbr.ts_state = 'e'
         self.add(txmbr)
         return txmbr
@@ -232,6 +236,7 @@
         txmbr = TransactionMember(po)
         txmbr.current_state = TS_AVAILABLE
         txmbr.output_state = TS_UPDATE
+        txmbr.po.state = TS_UPDATE        
         txmbr.ts_state = 'u'
         if oldpo:
             txmbr.relatedto.append((oldpo.pkgtup, 'updates'))
@@ -245,6 +250,7 @@
         txmbr = TransactionMember(po)
         txmbr.current_state = TS_AVAILABLE
         txmbr.output_state = TS_OBSOLETING
+        txmbr.po.state = TS_OBSOLETING
         txmbr.ts_state = 'u'
         txmbr.relatedto.append((oldpo, 'obsoletes'))
         self.add(txmbr)
@@ -257,6 +263,7 @@
         txmbr = TransactionMember(po)
         txmbr.current_state = TS_INSTALL
         txmbr.output_state =  TS_OBSOLETED
+        txmbr.po.state = TS_OBSOLETED
         txmbr.ts_state = None
         txmbr.relatedto.append((obsoleting_po, 'obsoletedby'))
         self.add(txmbr)

Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- packages.py	21 Jun 2005 18:25:04 -0000	1.37
+++ packages.py	27 Oct 2005 05:32:13 -0000	1.38
@@ -185,7 +185,8 @@
         self.summary = self.tagByName('summary')
         self.description = self.tagByName('description')
         self.pkgid = self.tagByName(rpm.RPMTAG_SHA1HEADER)
-    
+        self.state = None
+        
     def __str__(self):
         if self.epoch == '0':
             val = '%s - %s-%s.%s' % (self.name, self.version, self.release, 
@@ -296,7 +297,7 @@
         self.summary = self.tagByName('summary')
         self.description = self.tagByName('description')
         self.pkgtup = self._pkgtup()
-        
+        self.state = None
     
     def _pkgtup(self):
         return (self.name, self.arch, self.epoch, self.version, self.release)
@@ -324,7 +325,8 @@
         self.arch = self.returnSimple('arch')
         self.repoid = self.returnSimple('repoid')
         self.pkgtup = self._pkgtup()
-
+        self.state = None
+        
     def size(self):
         return self.returnSimple('packagesize')