DamianZaremba has submitted this change and it was merged.
Change subject: POP path
......................................................................
POP path
Change-Id: I21e21b6a967656816ac6bbeb30f520151ccbeaa6
---
M labsnagiosbuilder/build.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
DamianZaremba: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/labsnagiosbuilder/build.py b/labsnagiosbuilder/build.py
index 8d5e1de..5ff42fb 100755
--- a/labsnagiosbuilder/build.py
+++ b/labsnagiosbuilder/build.py
@@ -270,8 +270,8 @@
base_path = os.path.dirname(os.path.abspath(__file__))
for pclass in hosts[dc]['puppet_classes']:
pclass = '/'.join(pclass.split('::'))
- mclass_file = "%s.cfg" % os.path.join('templates', 'classes',
pclass)
- fmclass_file = os.path.abspath(os.path.join(base_path,
mclass_file))
+ mclass_file = "%s.cfg" % os.path.join('classes', pclass)
+ fmclass_file = os.path.abspath(os.path.join(base_path,
'templates', mclass_file))
if not fmclass_file.startswith(base_path):
logging.debug('Skipping %s as it looks dodgy' % mclass_file)
--
To view, visit https://gerrit.wikimedia.org/r/55422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21e21b6a967656816ac6bbeb30f520151ccbeaa6
Gerrit-PatchSet: 1
Gerrit-Project: labs/nagios-builder
Gerrit-Branch: master
Gerrit-Owner: DamianZaremba <[email protected]>
Gerrit-Reviewer: DamianZaremba <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
