Skip to content

Commit

Permalink
Merge pull request #99 from nrhodes91/fix-for-custom-collection-file-…
Browse files Browse the repository at this point in the history
…logging

Only report skipping default config file when using custom file
  • Loading branch information
rhodesn authored Dec 2, 2018
2 parents a4d45c1 + da01b11 commit cf25558
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion configsnap
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,8 @@ if os.path.exists(customcollectionfile):
Config.read(customcollectionfile)

# Does the default extra config file exist? Warn if yes
if os.path.exists('/etc/configsnap/additional.conf'):
if (os.path.exists('/etc/configsnap/additional.conf') and
customcollectionfile != '/etc/configsnap/additional.conf'):
report_info_blue("Default config file /etc/configsnap/"
"additional.conf will be ignored, using %s"
% customcollectionfile)
Expand Down

0 comments on commit cf25558

Please sign in to comment.