[yum-commits] 2 commits - repoquery.py

[skvidal at osuosl.org]

 repoquery.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 4b97361791d952e01f21d19cdf4c3dcb6fb71ac3
Merge: 0220d0f... 72cb1cb...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Oct 15 11:26:27 2008 -0400

    Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum-utils
    
    * 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum-utils:
      [fastestmirror] Return the correct value from _len_non_ftp
      Fix fastestmirror's exclusion code.
      Sort the dump output, to it's consistent
      Enable plugins, so we can print out which are enabled (and spacewalk works)
      Speedup package-cleanup --orphans, as yum list extras is
      Turn plugins on in package-cleanup, and add an option to turn them off
      Always refresh the cache for a manual repo. For repoquery;createrepo;repoquery

commit 0220d0f41a29e4b79426801d1ccf69861ea90eac
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Wed Oct 15 11:21:15 2008 -0400

    make sure --location returns the proper location if we have a basepath

diff --git a/repoquery.py b/repoquery.py
index 0bfd61c..ecd9b45 100755
--- a/repoquery.py
+++ b/repoquery.py
@@ -570,7 +570,10 @@ class YumBaseQuery(yum.YumBase):
         loc = []
         for pkg in self.returnByName(name):
             repo = self.repos.getRepo(pkg['repoid'])
-            loc.append("%s/%s" % (repo.urls[0], pkg['relativepath']))
+            if pkg['basepath']:
+                loc.append("%s/%s" % (pkg['basepath'], pkg['relativepath']))
+            else:
+                loc.append("%s/%s" % (repo.urls[0], pkg['relativepath']))
         return loc
 
 def main(args):