Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix: find if pisi is upgraded, correctly

Browse Source
This commit is contained in:
Eray Özkural
2006-05-10 14:29:13 +00:00
parent 3102be97d1
commit 1749acfa4b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/operations.py
+7 -3
View File
@@ -318,11 +318,13 @@ in the respective order to satisfy dependencies:
return False return False
ctx.ui.notify(ui.packagestogo, order = order) ctx.ui.notify(ui.packagestogo, order = order)
pisi_installed = ctx.installdb.is_installed('pisi')
for x in order: for x in order:
atomicoperations.install_single_name(x) atomicoperations.install_single_name(x)
if not bypass_safety and 'pisi' in order and ctx.installdb.is_installed('pisi'): if not bypass_safety and 'pisi' in order and pisi_installed:
upgrade_pisi() upgrade_pisi()
def plan_install_pkg_names(A): def plan_install_pkg_names(A):
@@ -713,6 +715,8 @@ installed in the respective order to satisfy dependencies:
ctx.ui.notify(ui.packagestogo, order = order_inst) ctx.ui.notify(ui.packagestogo, order = order_inst)
pisi_installed = ctx.installdb.is_installed('pisi')
for x in order_inst: for x in order_inst:
atomicoperations.install_single_name(x) atomicoperations.install_single_name(x)
@@ -722,7 +726,7 @@ installed in the respective order to satisfy dependencies:
package_names, blah = atomicoperations.build(x) package_names, blah = atomicoperations.build(x)
install_pkg_files(package_names) # handle inter-package deps here install_pkg_files(package_names) # handle inter-package deps here
if 'pisi' in order_build or ('pisi' in order_inst and ctx.installdb.is_installed('pisi')): if 'pisi' in order_build or ( ('pisi' in order_inst + order_build) and pisi_installed):
upgrade_pisi() upgrade_pisi()
def plan_emerge(A, rebuild_all): def plan_emerge(A, rebuild_all):