[yum-git] Branch 'yum-3_2_X' - 2 commits - yum/packages.py

[Seth Vidal]

 yum/packages.py |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit e49734fe9974e589f6ebdd6ae6e153e0e7aa425e
Merge: 3b7676a... 6885eb3...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Aug 8 15:34:40 2008 -0400

    Merge branch 'yum-3_2_X' of ssh://login.linux.duke.edu/home/groups/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
      Add test for no pygpgme, and give useful error message
      Fail valid_detached_sig if gpgme isn't installed
      Fix ts used for rpm-4.5.90-0.git8461.1 gpg key importing
      Fix copy&paste typo with syslogFacilityMap, and fix YumBase.doLoggingSetup
      Move syslog configs. to StatupConfig, act on them in logging. use LOG_DAEMON
      Another unicode => to_unicode, hopefully fixes 447504

commit 3b7676a25e07a865fc2afaff23d926d993c735fc
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Fri Aug 8 15:34:30 2008 -0400

    minor clean up to make sure when re-assemble the remote path we also make sure basepath isn't stupid for urljoin()

diff --git a/yum/packages.py b/yum/packages.py
index 014064d..9c05596 100644
--- a/yum/packages.py
+++ b/yum/packages.py
@@ -516,6 +516,9 @@ class YumAvailablePackage(PackageObject, RpmBase):
         you should use self.repo.getPackage."""
         base = self.basepath
         if base:
+            # urljoin sucks in the reverse way that os.path.join sucks :)
+            if base[-1] != '/':
+                base = base + '/'
             return urlparse.urljoin(base, self.remote_path)
         return urlparse.urljoin(self.repo.urls[0], self.remote_path)