raise special error on missing manifest

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-11-06 21:32:37 +01:00
parent e402473668
commit a22e729a3c

View file

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
# 2011 Steven Armstrong (steven-cdist at armstrong.cc) # 2011 Steven Armstrong (steven-cdist at armstrong.cc)
# 2011 Nico Schottelius (nico-cdist at schottelius.org) # 2011-2012 Nico Schottelius (nico-cdist at schottelius.org)
# #
# This file is part of cdist. # This file is part of cdist.
# #
@ -25,6 +25,20 @@ import os
import cdist import cdist
class NoInitialManifestError(cdist.Error):
"""
Display missing initial manifest
"""
def __init__(self, manifest_path):
if os.path.islink(manifest_path):
self.message = "%s -> %s" (manifest_path, os.path.realpath(manifest_path))
else:
self.message = manifest_path
def __str__(self):
return "Initial manifest missing: %s" % self.message
''' '''
common: common:
runs only locally, does not need remote runs only locally, does not need remote
@ -84,6 +98,11 @@ class Manifest(object):
env['__manifest'] = self.local.manifest_path env['__manifest'] = self.local.manifest_path
env['__cdist_manifest'] = script env['__cdist_manifest'] = script
self.log.info("Running initial manifest " + self.local.manifest_path) self.log.info("Running initial manifest " + self.local.manifest_path)
if not os.path.isfile(self.local.manifest_path):
print("fooooobar")
raise NoInitialManifestError(self.local.manifest_path)
self.local.run_script(script, env=env) self.local.run_script(script, env=env)
def run_type_manifest(self, cdist_object): def run_type_manifest(self, cdist_object):