Merge remote-tracking branch 'steven/master'

This commit is contained in:
Nico Schottelius 2011-10-07 13:14:58 +02:00
commit 484b947eca
3 changed files with 31 additions and 14 deletions

View file

@ -1,16 +1,7 @@
Object: Object:
code_remote
code
gencode
gencode_remote
path_remote
explorer_out_dir
Type: Type:
type.manifest_path
GlobalExplorer: GlobalExplorer:

View file

@ -108,6 +108,20 @@ class Object(object):
DOT_CDIST DOT_CDIST
) )
@property
def code_local(self):
return os.path.join(self.path, "code-local")
@property
def code_remote(self):
return os.path.join(self.path, "code-remote")
@property
def explorer_out_dir(self):
path = os.path.join(self.path, "explorer")
if not os.path.isdir(path):
os.mkdir(path)
return path
### requirements ### requirements
@property @property

View file

@ -70,11 +70,6 @@ class Type(object):
except KeyError as e: except KeyError as e:
raise cdist.MissingEnvironmentVariableError(e.args[0]) raise cdist.MissingEnvironmentVariableError(e.args[0])
# FIXME: probably wrong place for this
@property
def remote_explorer_dir(self):
return os.path.join(self.remote_path, "explorer")
@classmethod @classmethod
def list_types(cls): def list_types(cls):
"""Return a list of type instances""" """Return a list of type instances"""
@ -112,6 +107,23 @@ class Type(object):
self.name self.name
) )
# FIXME: probably wrong place for this
@property
def remote_explorer_dir(self):
return os.path.join(self.remote_path, "explorer")
@property
def manifest_path(self):
return os.path.join(self.path, "manifest")
@property
def gencode_local(self):
return os.path.join(self.path, "gencode-local")
@property
def gencode_remote(self):
return os.path.join(self.path, "gencode-remote")
@property @property
def is_singleton(self): def is_singleton(self):
"""Check whether a type is a singleton.""" """Check whether a type is a singleton."""