Skip to content

Commit

Permalink
fix bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
claytondaley committed Apr 30, 2019
1 parent 9b73491 commit e33935d
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions states/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def __init__(self, remote, local):
@classmethod
def get_plugin(cls, name):
if name in cls.plugins:
return cls.plugins[name]()
return cls.plugins[name]

@classmethod
def configure(cls, args):
Expand Down Expand Up @@ -102,7 +102,10 @@ def __init__(self, remote, local, force=False):

@classmethod
def configure(cls, args):
return partial(cls, force=args.diffresolver_force)
kwargs = {}
if hasattr(args, 'force'):
kwargs['force'] = args.force
return partial(cls, **kwargs)

def added(self):
"""Returns a (flattened) dict of added leaves i.e. {"full/path": value, ...}"""
Expand Down

0 comments on commit e33935d

Please sign in to comment.