* load comariface only when necessary, to deal with those installs

that don't have comar.py installed
This commit is contained in:
Eray Özkural
2005-10-09 22:39:45 +00:00
parent eb90adef9d
commit 7dc4271bfb
2 changed files with 8 additions and 4 deletions
+5 -1
View File
@@ -35,7 +35,6 @@ import pisi.repodb
import pisi.installdb import pisi.installdb
from pisi.index import Index from pisi.index import Index
import pisi.cli import pisi.cli
import pisi.comariface as comariface
class Error(pisi.Error): class Error(pisi.Error):
pass pass
@@ -476,8 +475,13 @@ def configure_pending():
order = G_f.topological_sort() order = G_f.topological_sort()
order.reverse() order.reverse()
#print order #print order
try:
import pisi.comariface as comariface
for x in order: for x in order:
comariface.run_postinstall(x) comariface.run_postinstall(x)
except ImportError:
raise Error(_("COMAR: comard not fully installed"))
def info(package): def info(package):
if package.endswith(ctx.const.package_prefix): if package.endswith(ctx.const.package_prefix):
+1 -1
View File
@@ -36,7 +36,6 @@ import pisi.operations as operations
from pisi.specfile import * from pisi.specfile import *
from pisi.package import Package from pisi.package import Package
from pisi.metadata import MetaData from pisi.metadata import MetaData
import pisi.comariface as comariface
#import conflicts #import conflicts
class Error(pisi.Error): class Error(pisi.Error):
@@ -66,6 +65,7 @@ class Installer:
self.store_pisi_files() self.store_pisi_files()
if ctx.comard: if ctx.comard:
self.register_comar_scripts() self.register_comar_scripts()
import pisi.comariface as comariface
comariface.run_postinstall(self.pkginfo.name) comariface.run_postinstall(self.pkginfo.name)
self.update_databases() self.update_databases()