diff options
| author | Fabian Affolter <fabian@bernewireless.net> | 2010-12-18 18:44:52 +0100 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-01-05 20:41:01 -0600 |
| commit | fb726eeb63c669a6b96dfeb4876e8c6bb6dbf28f (patch) | |
| tree | 614c1579022650a6414ced6cd0582b4ed43c2069 /src/lib/Server/Admin/Bundle.py | |
| parent | bc1ee763eef9caa66b1c4ab846c6884515dc93c4 (diff) | |
| download | bcfg2-fb726eeb63c669a6b96dfeb4876e8c6bb6dbf28f.tar.gz bcfg2-fb726eeb63c669a6b96dfeb4876e8c6bb6dbf28f.tar.bz2 bcfg2-fb726eeb63c669a6b96dfeb4876e8c6bb6dbf28f.zip | |
Merge
(cherry picked from commit 841dbffb1802716cfb820759dab1120e4f7857d4)
Diffstat (limited to 'src/lib/Server/Admin/Bundle.py')
| -rw-r--r-- | src/lib/Server/Admin/Bundle.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Server/Admin/Bundle.py b/src/lib/Server/Admin/Bundle.py index 893fde489..efbe2b486 100644 --- a/src/lib/Server/Admin/Bundle.py +++ b/src/lib/Server/Admin/Bundle.py @@ -10,9 +10,9 @@ class Bundle(Bcfg2.Server.Admin.MetadataCore): __shorthelp__ = "Create or delete bundle entries" __longhelp__ = (__shorthelp__ + #"\n\nbcfg2-admin bundle add <bundle> " #"\n\nbcfg2-admin bundle del <bundle>" - "\n\nbcfg2-admin bundle list-xml" - "\n\nbcfg2-admin bundle list-genshi" - "\n\nbcfg2-admin bundle show") + "\nbcfg2-admin bundle list-xml" + "\nbcfg2-admin bundle list-genshi" + "\nbcfg2-admin bundle show\n") __usage__ = ("bcfg2-admin bundle [options] [add|del] [group]") def __init__(self, configfile): @@ -23,7 +23,7 @@ class Bundle(Bcfg2.Server.Admin.MetadataCore): Bcfg2.Server.Admin.MetadataCore.__call__(self, args) reg='((?:[a-z][a-z\\.\\d\\-]+)\\.(?:[a-z][a-z\\-]+))(?![\\w\\.])' - #Get all bundles out of the Bundle/ directory + # Get all bundles out of the Bundle/ directory opts = {'repo': Bcfg2.Options.SERVER_REPOSITORY} setup = Bcfg2.Options.OptionParser(opts) setup.parse(sys.argv[1:]) |