diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-03 08:51:37 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-03 08:51:37 -0500 |
| commit | 69285ced4eec3e684802f70c321482776c5d96e3 (patch) | |
| tree | 88bb9a3c9cc2ee269f1c115c4f5fd9cf721b217c /src/lib/Server/Plugins/Packages | |
| parent | 5be6f4fb19b8702533ef5edf1f55e05ba161ecf5 (diff) | |
| download | bcfg2-69285ced4eec3e684802f70c321482776c5d96e3.tar.gz bcfg2-69285ced4eec3e684802f70c321482776c5d96e3.tar.bz2 bcfg2-69285ced4eec3e684802f70c321482776c5d96e3.zip | |
strip trailing slash from key URL to avoid funky traceback
Diffstat (limited to 'src/lib/Server/Plugins/Packages')
| -rw-r--r-- | src/lib/Server/Plugins/Packages/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Packages/__init__.py b/src/lib/Server/Plugins/Packages/__init__.py index 5b1515920..9e1ccfa37 100644 --- a/src/lib/Server/Plugins/Packages/__init__.py +++ b/src/lib/Server/Plugins/Packages/__init__.py @@ -227,7 +227,8 @@ class Packages(Bcfg2.Server.Plugin.Plugin, keys = [] for source in self.sources: for key in source.gpgkeys: - localfile = os.path.join(self.keypath, os.path.basename(key)) + localfile = os.path.join(self.keypath, + os.path.basename(key.rstrip("/"))) if localfile not in keyfiles: keyfiles.append(localfile) if ((force_update and key not in keys) or |