diff --git a/overrides/dpmt.json b/profiles/dpmt/ctx.json similarity index 100% rename from overrides/dpmt.json rename to profiles/dpmt/ctx.json diff --git a/overrides/papt.json b/profiles/papt/ctx.json similarity index 100% rename from overrides/papt.json rename to profiles/papt/ctx.json diff --git a/pypi2deb/__init__.py b/pypi2deb/__init__.py index bee0da9..35e9aef 100644 --- a/pypi2deb/__init__.py +++ b/pypi2deb/__init__.py @@ -26,6 +26,8 @@ abspath(join(dirname(__file__), '..', 'templates'))) OVERRIDES_PATH = environ.get('PYPI2DEB_OVERRIDES_PATH', abspath(join(dirname(__file__), '..', 'overrides'))) +PROFILES_PATH = environ.get('PYPI2DEB_PROFILES_PATH', + abspath(join(dirname(__file__), '..', 'profiles'))) VERSION = '0.20150816' # Add path to dh-python's private library # (yeah, it's not stable enough to make it public one, fortunatly diff --git a/pypi2deb/debianize.py b/pypi2deb/debianize.py index 9424f9f..10e1fed 100644 --- a/pypi2deb/debianize.py +++ b/pypi2deb/debianize.py @@ -25,7 +25,7 @@ from os.path import exists, join from shutil import copy -from pypi2deb import VERSION, TEMPLATES_PATH, OVERRIDES_PATH +from pypi2deb import VERSION, OVERRIDES_PATH, PROFILES_PATH, TEMPLATES_PATH from pypi2deb.tools import execute from jinja2 import Environment, FileSystemLoader @@ -72,7 +72,7 @@ def debianize(dpath, ctx, profile=None): with open(profile) as fp: ctx.update(load(fp)) else: - profile_fpath = join(OVERRIDES_PATH, profile + '.json') + profile_fpath = join(PROFILES_PATH, profile, 'ctx.json') if exists(profile_fpath): with open(profile_fpath) as fp: ctx.update(load(fp)) @@ -92,6 +92,8 @@ def debianize(dpath, ctx, profile=None): override_dpath = join(override_path, 'debian') _copy_static_files(override_dpath, debian_dir) _copy_static_files(join(TEMPLATES_PATH, 'debian'), debian_dir) + if profile: + _copy_static_files(join(PROFILES_PATH, profile, 'debian'), debian_dir) env = Environment(loader=FileSystemLoader([dpath, override_path, TEMPLATES_PATH]))