From 75e85379f6f2c6490172c859574569d0fd1fce83 Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Thu, 27 Oct 2016 18:34:24 +0200 Subject: [PATCH 1/2] Order subcommands alphabetically. --- scripts/cdist | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/cdist b/scripts/cdist index 9f8d326d..68084ca4 100755 --- a/scripts/cdist +++ b/scripts/cdist @@ -159,6 +159,11 @@ def commandline(): default=os.environ.get('CDIST_REMOTE_EXEC')) parser['config'].set_defaults(func=cdist.config.Config.commandline) + # Install + parser['install'] = parser['sub'].add_parser('install', add_help=False, + parents=[parser['config']]) + parser['install'].set_defaults(func=cdist.install.Install.commandline) + # Shell parser['shell'] = parser['sub'].add_parser( 'shell', parents=[parser['loglevel']]) @@ -168,11 +173,6 @@ def commandline(): ' should be POSIX compatible shell.')) parser['shell'].set_defaults(func=cdist.shell.Shell.commandline) - # Install - parser['install'] = parser['sub'].add_parser('install', add_help=False, - parents=[parser['config']]) - parser['install'].set_defaults(func=cdist.install.Install.commandline) - for p in parser: parser[p].epilog = ( "Get cdist at http://www.nico.schottelius.org/software/cdist/") From c293a9b2cea5c59a3098d49c3df7e4d2c71a3956 Mon Sep 17 00:00:00 2001 From: Darko Poljak Date: Tue, 1 Nov 2016 08:11:37 +0100 Subject: [PATCH 2/2] Add missing param. --- cdist/install.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cdist/install.py b/cdist/install.py index bec8d24a..b88ad016 100644 --- a/cdist/install.py +++ b/cdist/install.py @@ -30,7 +30,8 @@ class Install(cdist.config.Config): In install mode, we only care about install objects. """ for cdist_object in cdist.core.CdistObject.list_objects( - self.local.object_path, self.local.type_path): + self.local.object_path, self.local.type_path, + self.local.object_marker_name): if cdist_object.cdist_type.is_install: yield cdist_object else: