diff options
| author | Fabian Affolter <fabian@bernewireless.net> | 2010-12-27 16:49:49 +0100 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-01-05 20:42:34 -0600 |
| commit | 9e7a2039f75b6cf0659d1b3c9ad076502f61edef (patch) | |
| tree | de3d3639ff10eab84db23aaedbd7a97104621bba /src/lib/Server/Admin/Pull.py | |
| parent | 2c86aa91d280eb4e5982fc2233fd2dd205995da6 (diff) | |
| download | bcfg2-9e7a2039f75b6cf0659d1b3c9ad076502f61edef.tar.gz bcfg2-9e7a2039f75b6cf0659d1b3c9ad076502f61edef.tar.bz2 bcfg2-9e7a2039f75b6cf0659d1b3c9ad076502f61edef.zip | |
Help layout fixed
(cherry picked from commit 21fa57fc48e90c96849918fd7059d04daa01f123)
Diffstat (limited to 'src/lib/Server/Admin/Pull.py')
| -rw-r--r-- | src/lib/Server/Admin/Pull.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Server/Admin/Pull.py b/src/lib/Server/Admin/Pull.py index 289852f79..926eda1b3 100644 --- a/src/lib/Server/Admin/Pull.py +++ b/src/lib/Server/Admin/Pull.py @@ -9,7 +9,7 @@ class Pull(Bcfg2.Server.Admin.MetadataCore): __shorthelp__ = ("Integrate configuration information " "from clients into the server repository") __longhelp__ = (__shorthelp__ + "\n\nbcfg2-admin pull [-v] [-f][-I] [-s] " - "<client> <entry type> <entry name>") + "<client> <entry type> <entry name>\n") __usage__ = ("bcfg2-admin pull [options] <client> <entry type> " "<entry name>\n\n" " %-25s%s\n" @@ -117,7 +117,7 @@ class Pull(Bcfg2.Server.Admin.MetadataCore): new_entry = self.BuildNewEntry(client, etype, ename) meta = self.bcore.build_metadata(client) - # find appropriate plugin in bcore + # Find appropriate plugin in bcore glist = [gen for gen in self.bcore.generators if ename in gen.Entries.get(etype, {})] if len(glist) != 1: @@ -135,7 +135,7 @@ class Pull(Bcfg2.Server.Admin.MetadataCore): except Bcfg2.Server.Plugin.PluginExecutionError: self.errExit("Configuration upload not supported by plugin %s" \ % (plugin.name)) - # commit if running under a VCS + # Commit if running under a VCS for vcsplugin in self.bcore.plugins.values(): if isinstance(vcsplugin, Bcfg2.Server.Plugin.Version): files = "%s/%s" % (plugin.data, ename) |