[yum-cvs] yum cli.py,1.155,1.156

Seth Vidal skvidal at login.linux.duke.edu
Sat Feb 26 09:11:58 UTC 2005


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

Modified Files:
	cli.py 
Log Message:

make the gpgkey importer check the rpmdb in the installroot if specified.


Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- cli.py	24 Feb 2005 08:25:35 -0000	1.155
+++ cli.py	26 Feb 2005 09:11:56 -0000	1.156
@@ -800,7 +800,7 @@
                             'GPG key parsing failed: ' + str(e)
 
                 # Check if key is already installed
-                if yum.misc.keyInstalled(keyid, timestamp) >= 0:
+                if yum.misc.keyInstalled(self.read_ts, keyid, timestamp) >= 0:
                     self.log(0, '\n')
                     raise yum.Errors.YumBaseError, \
                             'The GPG key at %s (0x%s) \n' \




More information about the Yum-cvs-commits mailing list