From 0e2585ee47031928ab2f1637a0cf917d307c99b0 Mon Sep 17 00:00:00 2001
From: Jochen Breuer <breuer@dajool.com>
Date: Tue, 21 Feb 2017 12:56:34 +0100
Subject: [PATCH 1/2] Made imports Python3 compatible

In Python 3 dict_config_parser has been renamed to configparser.
Switched to explicit imports, which are required now.
---
 basalt/tasks/__init__.py          | 26 ++++++++++++++++----------
 basalt/tasks/config_generator.py  |  6 +++---
 basalt/tasks/package_generator.py |  9 +++++++++
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/basalt/tasks/__init__.py b/basalt/tasks/__init__.py
index 8b3d651..d5a8fb2 100644
--- a/basalt/tasks/__init__.py
+++ b/basalt/tasks/__init__.py
@@ -1,10 +1,16 @@
-from dict_config_parser import DictConfigParser
-from config_generator import generate_config
-from config_generator import get_config_vars
-from fs_commands import mkdirp
-from simple_version import get_major_version
-from simple_version import get_minor_version
-from simple_version import get_minor_version_with_increment
-from package_generator import package
-from vcs_info import get_commit_rev
-from vcs_info import get_branch
+try:
+    # python 2.x
+    from dict_config_parser import DictConfigParser
+except ImportError:
+    # python 3.x
+    from configparser import ConfigParser
+
+from .config_generator import generate_config
+from .config_generator import get_config_vars
+from .fs_commands import mkdirp
+from .simple_version import get_major_version
+from .simple_version import get_minor_version
+from .simple_version import get_minor_version_with_increment
+from .package_generator import package
+from .vcs_info import get_commit_rev
+from .vcs_info import get_branch
diff --git a/basalt/tasks/config_generator.py b/basalt/tasks/config_generator.py
index 461c778..903c2cc 100644
--- a/basalt/tasks/config_generator.py
+++ b/basalt/tasks/config_generator.py
@@ -2,8 +2,8 @@
 import sys
 import yaml
 
-from utils import print_err
-from fs_commands import mkdirp
+from .utils import print_err
+from .fs_commands import mkdirp
 from jinja2 import Template, Environment, FileSystemLoader
 
 env = Environment(loader=FileSystemLoader('templates'))
@@ -22,7 +22,7 @@ def generate_config(template_name, config, outputfile, section="build-vars"):
     """\
     Generates a config from a template and with values from the yaml config.
 
-    A section can optionally be passed if somthing else than 'build-vars' should be used. 
+    A section can optionally be passed if somthing else than 'build-vars' should be used.
     """
     config_vars = get_config_vars(config)
     script_template = env.get_template(template_name)
diff --git a/basalt/tasks/package_generator.py b/basalt/tasks/package_generator.py
index dc41305..e36cb77 100644
--- a/basalt/tasks/package_generator.py
+++ b/basalt/tasks/package_generator.py
@@ -57,6 +57,15 @@ def package(yaml_conf_file, injects=None, builder='fpm'):
                 # fpm_args.append(single_dash_parameter % ('d', dependency))
                 fpm_args.append("-d")
                 fpm_args.append(dependency)
+    if gen_config.has_key('conflicts'):
+        dependencies = gen_config.pop('conflicts')
+        if type(dependencies) is str:
+            fpm_args.append("--conflicts")
+            fpm_args.append(dependencies)
+        elif type(dependencies) is list:
+            for dependency in dependencies:
+                fpm_args.append("--conflicts")
+                fpm_args.append(dependency)
 
     for key, value in gen_config.items():
         param = ""

From b93372d64ed335d98eea71cb8c09bcb882a63983 Mon Sep 17 00:00:00 2001
From: Jochen Breuer <breuer@dajool.com>
Date: Tue, 21 Feb 2017 13:03:03 +0100
Subject: [PATCH 2/2] Removed conflicts changes

These changes leaked in with the last commit, but should be moved to an
other branch.
---
 basalt/tasks/package_generator.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/basalt/tasks/package_generator.py b/basalt/tasks/package_generator.py
index e36cb77..dc41305 100644
--- a/basalt/tasks/package_generator.py
+++ b/basalt/tasks/package_generator.py
@@ -57,15 +57,6 @@ def package(yaml_conf_file, injects=None, builder='fpm'):
                 # fpm_args.append(single_dash_parameter % ('d', dependency))
                 fpm_args.append("-d")
                 fpm_args.append(dependency)
-    if gen_config.has_key('conflicts'):
-        dependencies = gen_config.pop('conflicts')
-        if type(dependencies) is str:
-            fpm_args.append("--conflicts")
-            fpm_args.append(dependencies)
-        elif type(dependencies) is list:
-            for dependency in dependencies:
-                fpm_args.append("--conflicts")
-                fpm_args.append(dependency)
 
     for key, value in gen_config.items():
         param = ""