client/rhel/yum-rhn-plugin/rhnplugin.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
New commits:
commit 6da41679b8fe50538f108111fabe5b5cfc46e636
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Mar 17 11:50:52 2011 +0100
684342 - beside repo.id, cache even repo.name
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py
b/client/rhel/yum-rhn-plugin/rhnplugin.py
index d2ac6a7..5f938e2 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -61,15 +61,16 @@ def init_hook(conduit):
cachefilename = os.path.join(cachedir, cachedRHNReposFile)
if os.access(cachefilename, os.R_OK):
cachefile = open(cachefilename, 'r')
- repolist = [ line.rstrip() for line in cachefile.readlines()]
+ repolist = [ line.rstrip().split(' ', 1) for line in
cachefile.readlines()]
cachefile.close()
- for reponame in repolist:
- repodir = os.path.join(cachedir, reponame)
+ for (repoid, reponame) in repolist:
+ repodir = os.path.join(cachedir, repoid)
if os.path.isdir(repodir):
- repo = YumRepository(reponame)
+ repo = YumRepository(repoid)
repo.basecachedir = cachedir
repo.baseurl = ['file:///' + repodir ]
repo.urls = repo.baseurl
+ repo.name = reponame
repo.enable()
if not repos.findRepos(repo.id):
repos.add(repo)
@@ -174,7 +175,7 @@ def prereposetup_hook(conduit):
repos.delete(repo.id)
repos.add(repo)
if cachefile:
- cachefile.write(repo.id + "\n")
+ cachefile.write("%s %s\n" % (repo.id, repo.name))
if cachefile:
cachefile.close()
Show replies by date