From 5a9f63ad237ee1f67a1d3354310ee26bf3e6867d Mon Sep 17 00:00:00 2001 From: JF Ding Date: Thu, 22 Sep 2011 17:27:05 +0800 Subject: [PATCH] zypp: move the checking for new api near zypp import --- plugins/backend/zypppkgmgr.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/backend/zypppkgmgr.py b/plugins/backend/zypppkgmgr.py index 64660fb..2467e6a 100644 --- a/plugins/backend/zypppkgmgr.py +++ b/plugins/backend/zypppkgmgr.py @@ -23,7 +23,11 @@ import shutil import rpmUtils.miscutils import rpmUtils.transaction import rpm + import zypp +if not hasattr(zypp, 'PoolQuery'): + raise ImportError("python-zypp in host system cannot support PoolQuery interface, please " + "update it to enhanced version which can be found in repo.meego.com/tools") from mic import msger from mic.kickstart import ksparser @@ -32,10 +36,6 @@ from mic.utils.proxy import get_proxy_for from mic.utils.errors import CreatorError from mic.imager.baseimager import BaseImageCreator -if not hasattr(zypp, 'PoolQuery'): - raise ImportError("python-zypp in host system cannot support PoolQuery interface, please " - "update it to enhanced version which can be found in repo.meego.com/tools") - class RepositoryStub: def __init__(self): self.name = None @@ -82,7 +82,6 @@ class Zypp(BackendPlugin): self.has_prov_query = True - def doFileLogSetup(self, uid, logfile): # don't do the file log for the livecd as it can lead to open fds # being left and an inability to clean up after ourself -- 2.7.4