Emerge should install the package whether it is installed or not
BUG:FIXED:11004
This commit is contained in:
+9
-5
@@ -477,6 +477,15 @@ def set_repo_activity(name, active):
|
|||||||
repodb.deactivate_repo(name)
|
repodb.deactivate_repo(name)
|
||||||
pisi.db.regenerate_caches()
|
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
|
@locked
|
||||||
def delete_cache():
|
def delete_cache():
|
||||||
"""
|
"""
|
||||||
@@ -807,11 +816,6 @@ def rebuild_db(files=False):
|
|||||||
# from pisi.build import build_until
|
# from pisi.build import build_until
|
||||||
# from pisi.atomicoperations import resurrect_package, build
|
# 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):
|
def calculate_conflicts(*args, **kw):
|
||||||
return pisi.conflict.calculate_conflicts(*args, **kw)
|
return pisi.conflict.calculate_conflicts(*args, **kw)
|
||||||
|
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ installed in the respective order to satisfy dependencies:
|
|||||||
|
|
||||||
for x in order_build:
|
for x in order_build:
|
||||||
package_names = atomicoperations.build(x)[0]
|
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
|
# reset counts between builds
|
||||||
ctx.ui.errors = ctx.ui.warnings = 0
|
ctx.ui.errors = ctx.ui.warnings = 0
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user