From 69285ced4eec3e684802f70c321482776c5d96e3 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 3 Jan 2012 08:51:37 -0500 Subject: strip trailing slash from key URL to avoid funky traceback --- src/lib/Server/Plugins/Packages/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/lib/Server/Plugins/Packages') 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 -- cgit v1.2.3-1-g7c22