From 3d8470e68f2ab8808041f7947e64a8403ee9a8d9 Mon Sep 17 00:00:00 2001
From: Faik Uygur <faik@pardus.org.tr>
Date: Wed, 9 Sep 2009 07:56:23 +0000
Subject: [PATCH] Emerge should install the package whether it is installed or
 not

BUG:FIXED:11004
---
 pisi/api.py               | 14 +++++++++-----
 pisi/operations/emerge.py |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pisi/api.py b/pisi/api.py
index 6ee7daaf..ab6ae9e4 100644
--- a/pisi/api.py
+++ b/pisi/api.py
@@ -477,6 +477,15 @@ def set_repo_activity(name, active):
         repodb.deactivate_repo(name)
     pisi.db.regenerate_caches()
 
+@locked
+def emerge(packages):
+    """
+    Builds and installs the given packages from source
+    @param packages: list of package names -> list_of_strings
+    """
+    pisi.db.historydb.HistoryDB().create_history("emerge")
+    return pisi.operations.emerge.emerge(packages)
+
 @locked
 def delete_cache():
     """
@@ -807,11 +816,6 @@ def rebuild_db(files=False):
 # from pisi.build import build_until
 # from pisi.atomicoperations import resurrect_package, build
 
-@locked
-def emerge(*args, **kw):
-    pisi.db.historydb.HistoryDB().create_history("emerge")
-    return pisi.operations.emerge.emerge(*args, **kw)
-
 def calculate_conflicts(*args, **kw):
     return pisi.conflict.calculate_conflicts(*args, **kw)
 
diff --git a/pisi/operations/emerge.py b/pisi/operations/emerge.py
index 96723377..754123e7 100644
--- a/pisi/operations/emerge.py
+++ b/pisi/operations/emerge.py
@@ -71,7 +71,7 @@ installed in the respective order to satisfy dependencies:
 
     for x in order_build:
         package_names = atomicoperations.build(x)[0]
-        pisi.operations.install.install_pkg_files(package_names) # handle inter-package deps here
+        pisi.operations.install.install_pkg_files(package_names, reinstall=True) # handle inter-package deps here
         # reset counts between builds
         ctx.ui.errors = ctx.ui.warnings = 0