[yum-cvs] yum cli.py,1.144.2.3,1.144.2.4
Seth Vidal
skvidal at login.linux.duke.edu
Sat Feb 26 09:14:03 UTC 2005
Update of /home/groups/yum/cvs/yum
In directory login:/tmp/cvs-serv23308
Modified Files:
Tag: yum-2_2_X
cli.py
Log Message:
make sure keyInstalled check is occuring in the right rpmdb root.
Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/cli.py,v
retrieving revision 1.144.2.3
retrieving revision 1.144.2.4
diff -u -r1.144.2.3 -r1.144.2.4
--- cli.py 11 Feb 2005 07:03:19 -0000 1.144.2.3
+++ cli.py 26 Feb 2005 09:14:00 -0000 1.144.2.4
@@ -752,7 +752,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