DamianZaremba has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55418
Change subject: Jinja won't take the full path
......................................................................
Jinja won't take the full path
Change-Id: Id1334f42337e954f56d5e6530e4165b04a435f31
---
M labsnagiosbuilder/build.py
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/nagios-builder
refs/changes/18/55418/1
diff --git a/labsnagiosbuilder/build.py b/labsnagiosbuilder/build.py
index 56c77c4..2827fd0 100755
--- a/labsnagiosbuilder/build.py
+++ b/labsnagiosbuilder/build.py
@@ -270,9 +270,10 @@
base_path = os.path.dirname(os.path.abspath(__file__))
for pclass in hosts[dc]['puppet_classes']:
pclass = '/'.join(pclass.split('::'))
- mclass_file = os.path.abspath("%s.cfg" % os.path.join(base_path,
'templates', 'classes', pclass))
+ mclass_file = "%s.cfg" % os.path.join('templates', 'classes',
pclass)
+ fmclass_file = os.path.abspath(base_path, mclass_file)
- if not mclass_file.startswith(base_path):
+ if not fmclass_file.startswith(base_path):
logging.debug('Skipping %s as it looks dodgy' % mclass_file)
continue
--
To view, visit https://gerrit.wikimedia.org/r/55418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1334f42337e954f56d5e6530e4165b04a435f31
Gerrit-PatchSet: 1
Gerrit-Project: labs/nagios-builder
Gerrit-Branch: master
Gerrit-Owner: DamianZaremba <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
