diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2012-04-19 09:39:32 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2012-04-19 09:39:32 -0500 |
commit | 232963077d5883d3e7b15ad15a10063bb1986de9 (patch) | |
tree | 2b7c09dfdce07662dd7028e5a6f76ec06444f603 /src/sbin | |
parent | fb63e457428f5bb91e5e80be40f5ac166d712d50 (diff) | |
parent | 3824f10c6edaa7ee1cfff65d1eb17343a5b20b9c (diff) | |
download | bcfg2-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/sbin')
-rwxr-xr-x | src/sbin/bcfg2-info | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 580de5248..f4d199001 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -44,7 +44,7 @@ groups - List groups help - Print this list of available commands mappings <type*> <name*> - Print generator mappings for optional type and name packageresolve <hostname> <package> [<package>...] - Resolve the specified set of packages -packagesources - Show package sources +packagesources <hostname> - Show package sources profile <command> <args> - Profile a single bcfg2-info command quit - Exit the bcfg2-info command line showentries <hostname> <type> - Show abstract configuration entries for a given host @@ -506,20 +506,26 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.Core): # get_urls() loads url_map as a side-effect source.get_urls() for url_map in source.url_map: - if url_map['arch'] in metadata.groups: - reponame = source.get_repo_name(url_map) - print("Name: %s" % reponame) - print(" Type: %s" % source.ptype) + for arch in url_map['arches']: + # make sure client is in all the proper arch groups + if arch not in metadata.groups: + continue + reponame = source.get_repo_name(url_map) + print("Name: %s" % reponame) + print(" Type: %s" % source.ptype) + if url_map['url'] != '': print(" URL: %s" % url_map['url']) - if source.gpgkeys: - print(" GPG Key(s): %s" % ", ".join(source.gpgkeys)) - else: - print(" GPG Key(s): None") - if len(source.blacklist): - print(" Blacklist: %s" % ", ".join(source.blacklist)) - if len(source.whitelist): - print(" Whitelist: %s" % ", ".join(source.whitelist)) - print("") + elif url_map['rawurl'] != '': + print(" RAWURL: %s" % url_map['rawurl']) + if source.gpgkeys: + print(" GPG Key(s): %s" % ", ".join(source.gpgkeys)) + else: + print(" GPG Key(s): None") + if len(source.blacklist): + print(" Blacklist: %s" % ", ".join(source.blacklist)) + if len(source.whitelist): + print(" Whitelist: %s" % ", ".join(source.whitelist)) + print("") def do_profile(self, arg): """.""" |