summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2012-04-19 09:39:32 -0500
committerSol Jerome <sol.jerome@gmail.com>2012-04-19 09:39:32 -0500
commit232963077d5883d3e7b15ad15a10063bb1986de9 (patch)
tree2b7c09dfdce07662dd7028e5a6f76ec06444f603 /src/lib/Bcfg2/Server/Plugins
parentfb63e457428f5bb91e5e80be40f5ac166d712d50 (diff)
parent3824f10c6edaa7ee1cfff65d1eb17343a5b20b9c (diff)
downloadbcfg2-232963077d5883d3e7b15ad15a10063bb1986de9.tar.gz
bcfg2-232963077d5883d3e7b15ad15a10063bb1986de9.tar.bz2
bcfg2-232963077d5883d3e7b15ad15a10063bb1986de9.zip
Merge branch 'maint'
Conflicts: src/sbin/bcfg2-info Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Packages/Source.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
index 5394a4bbd..a7c246940 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/Source.py
@@ -136,8 +136,9 @@ class Source(Bcfg2.Server.Plugin.Debuggable):
def get_repo_name(self, url_map):
# try to find a sensible name for a repo
- if url_map['component']:
- rname = url_map['component']
+ if url_map['components']:
+ # use the first component as the name
+ rname = url_map['components'][0]
else:
name = None
for repo_re in (self.mrepo_re,