Merge branch 'patch-41840' into 'master'

Issue #20 halledildi.

See merge request sulinos/devel/inary!19

inary/actionsapi/shelltools.py

@@ -18,7 +18,7 @@ from inary.util import join_path
 from inary.util import run_logged
 
 # ActionsAPI Modules
-inary.actionsapi import error
+from inary.actionsapi import error
 
 # Standart Python Modules
 import os

inary/api.py

@@ -156,3 +156,20 @@ def set_options(options):
 
 # The following are INARY operations which constitute the INARY API
 # Within functions
+from inary.analyzer.conflict import calculate_conflicts
+from inary.db.filesdb import rebuild_db
+from inary.data.index import index
+from inary.data.pgraph import package_graph
+from inary.fetcher import fetch
+from inary.operations.build import build, build_until
+from inary.operations.check import check
+from inary.operations.emerge import emerge
+from inary.operations.helper import calculate_download_sizes, calculate_free_space_needed, get_package_requirements
+from inary.operations.history import takeback, get_takeback_plan, snapshot
+from inary.operations.info import info
+from inary.operations.install import install, get_install_order
+from inary.operations.remove import remove, get_remove_order
+from inary.operations.repository import *
+from inary.operations.upgrade import upgrade, get_upgrade_order, get_base_upgrade_order
+from inary.operations.search import *
+

inary/operations/build.py

@@ -23,7 +23,6 @@ import stat
 import fnmatch
 
 # Inary Modules
-import inary.api
 import inary.db
 import inary.uri
 import inary.file
@@ -617,6 +616,12 @@ class Builder:
         ctx.ui.status(_("Building source package: \"{}\" [ InstallAction Step ]").format(self.spec.source.name),
                       push_screen=False)
         ctx.ui.action(util.colorize(">>> ", 'cyan') + _("Installing..."))
+        install_dir = self.pkg_install_dir()
+
+        if os.path.isdir(install_dir):
+            util.clean_dir(install_dir)
+            util.makedirs(install_dir)
+            ctx.ui.info(_("[!] InstallDir {} cleant up.".format(install_dir)),verbose=True)
 
         # install function is mandatory!
         if self.run_action_function(ctx.const.install_func, True):
@@ -892,7 +897,7 @@ class Builder:
                 if ctx.ui.confirm(
                         _('Would you like to install the unsatisfied build dependencies?')):
                     ctx.ui.info(_('Installing build dependencies.'))
-                    if not inary.api.install(
+                    if not inary.operations.install.install(
                             [dep.package for dep in dep_unsatis], reinstall=True):
                         fail()
                 else: