[yum-cvs] yum-utils repoquery.py,1.14,1.15

[Panu Matilainen]

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

Modified Files:
	repoquery.py 
Log Message:
Add private cachedir support to reqoquery (default when non-root)


Index: repoquery.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/repoquery.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- repoquery.py	23 Jun 2005 04:10:24 -0000	1.14
+++ repoquery.py	23 Jun 2005 06:27:55 -0000	1.15
@@ -32,6 +32,7 @@
 import yum.packages
 import repomd.mdErrors
 from rpmUtils.arch import getArchList
+from yum.misc import getCacheDir
 
 version = "0.0.8"
 
@@ -403,6 +404,8 @@
                       help="quiet (no output to stderr)")
     parser.add_option("-C", "--cache", default=0, action="store_true",
                       help="run from cache only")
+    parser.add_option("--tempcache", default=0, action="store_true",
+                      help="use private cache (default when used as non-root)")
 
     (opts, regexs) = parser.parse_args()
     if opts.version:
@@ -462,9 +465,16 @@
     repoq = YumBaseQuery(pkgops, sackops, opts)
     repoq.doConfigSetup()
     
-    if os.geteuid() != 0 or opts.cache:
+    if os.geteuid() != 0 or opts.tempcache:
+        cachedir = getCacheDir()
+        if cachedir is None:
+            repoq.errorlog("0, Error: Could not make cachedir, exiting")
+            sys.exit(50)
+        repoq.repos.setCacheDir(cachedir)
+
+    if opts.cache:
         repoq.conf.setConfigOption('cache', 1)
-        repoq.errorlog(0, 'Running from cache, results might be out of date.')
+        repoq.errorlog(0, 'Running from cache, results might be incomplete.')
     
     if len(opts.repoid) > 0:
         for repo in repoq.repos.findRepos('*'):