updated django and initialize so it creates the relative path using layout.fabric.root/layout.fabric.home, got rid of paths.tools.fabric.full and replaces paths.tools.fabric.relative with just paths.tools.fabric

This commit is contained in:
ronny abraham 2023-07-07 15:47:02 +03:00
parent 74290fcd59
commit 940ef17a7d
3 changed files with 8 additions and 12 deletions

View file

@ -463,7 +463,7 @@ def generate_scripts(template_name, make_copy=False):
context['project_name'] = project_name
context['project_branch'] = project_branch
context['secret_key'] = secret_key
context['paths_tools_fabric'] = configuration.paths.tools.fabric.relative
context['paths_tools_fabric'] = configuration.paths.tools.fabric
copy_path = "{project_path}/{project_name}".format(
project_path=project_path,

View file

@ -347,17 +347,13 @@ def get_config(branchname):
# tools used in development
dataobject.paths.addbranch('tools')
dataobject.paths.tools.addbranch('fabric')
#
# create both the relative and full paths for the fabric implementation
dataobject.paths.tools.fabric.relative = \
layout['paths']['tools']['fabric']['root']
dataobject.paths.tools.fabric.full = os.path.join(
dataobject.paths.project.root,
dataobject.paths.tools.fabric.relative)
dataobject.paths.tools.fabric = os.path.join(
layout['paths']['tools']['fabric']['root'],
layout['paths']['tools']['fabric']['home'])
dataobject.addbranch('tools')
dataobject.tools.addbranch('fabric')
@ -365,17 +361,17 @@ def get_config(branchname):
dataobject.tools.fabric.templates.conf = os.path.join(
dataobject.paths.project.root,
dataobject.paths.tools.fabric.full,
dataobject.paths.tools.fabric,
layout['paths']['tools']['fabric']['templates']['conf'])
dataobject.tools.fabric.templates.meta = os.path.join(
dataobject.paths.project.root,
dataobject.paths.tools.fabric.full,
dataobject.paths.tools.fabric,
layout['paths']['tools']['fabric']['templates']['meta'])
dataobject.tools.fabric.templates.readmes = os.path.join(
dataobject.paths.project.root,
dataobject.paths.tools.fabric.full,
dataobject.paths.tools.fabric,
layout['paths']['tools']['fabric']['templates']['readmes'])
#

View file

@ -12,7 +12,7 @@ paths:
tools:
fabric:
root: "usr/bin/fabric"
root: "usr/bin/customfabric"
templates:
conf: "share/templates/conf"
meta: "share/templates/meta"