Skip to content

Commit

Permalink
Fix part 1 of saltstack#18353
Browse files Browse the repository at this point in the history
  • Loading branch information
thatch45 committed Nov 21, 2014
1 parent c02e2e9 commit 481a52c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions salt/utils/parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,8 @@ def process_saltfile(self):
saltfile = os.path.join(os.getcwd(), 'Saltfile')
if os.path.isfile(saltfile):
self.options.saltfile = saltfile
else:
saltfile = self.options.saltfile

if not self.options.saltfile:
# There's still no valid Saltfile? No need to continue...
Expand Down

0 comments on commit 481a52c

Please sign in to comment.