diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2011-01-06 14:27:46 -0600 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2011-01-06 14:27:46 -0600 |
| commit | f384258af81136eacc85cf4adb01db34667600ab (patch) | |
| tree | f73b4f28fd369d116ffcc52077f494ec426742d4 /src/lib/Server/Admin/Bundle.py | |
| parent | bd5aebba93fbd67b61d1a6f3ec221bc7e94f1559 (diff) | |
| parent | f2f34ec086678222708535df74d9ee929f65a78a (diff) | |
| download | bcfg2-f384258af81136eacc85cf4adb01db34667600ab.tar.gz bcfg2-f384258af81136eacc85cf4adb01db34667600ab.tar.bz2 bcfg2-f384258af81136eacc85cf4adb01db34667600ab.zip | |
Merge branch 'master' of git.mcs.anl.gov:bcfg2
Diffstat (limited to 'src/lib/Server/Admin/Bundle.py')
| -rw-r--r-- | src/lib/Server/Admin/Bundle.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Server/Admin/Bundle.py b/src/lib/Server/Admin/Bundle.py index 893fde489..96a7ba59d 100644 --- a/src/lib/Server/Admin/Bundle.py +++ b/src/lib/Server/Admin/Bundle.py @@ -11,8 +11,8 @@ class Bundle(Bcfg2.Server.Admin.MetadataCore): __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-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:]) |