From cac3ad8b01f660174bc6ea20e38ed1e7a9d027ce Mon Sep 17 00:00:00 2001 From: Gui Chen Date: Wed, 4 Dec 2013 21:09:40 -0500 Subject: [PATCH] fix conflict name Change-Id: I9f6c08977f91fff458efd7bec754599671e456d5 Signed-off-by: Gui Chen --- mic/bootstrap.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mic/bootstrap.py b/mic/bootstrap.py index d59b718..3fd4d87 100644 --- a/mic/bootstrap.py +++ b/mic/bootstrap.py @@ -135,17 +135,17 @@ class MiniBackend(object): # run transaction self.ts.order() cb = RPMInstallCallback(self.ts) - errors = self.ts.run(cb.callback, '') + errs = self.ts.run(cb.callback, '') # ts.run() exit codes are, hmm, "creative": None means all ok, empty # list means some errors happened in the transaction and non-empty # list that there were errors preventing the ts from starting... - if errors is None: + if errs is None: pass - elif len(errors) == 0: + elif len(errs) == 0: msger.warning("Warning: scriptlet or other non-fatal errors occurred") else: - raise errors.BootstrapError("Transaction couldn't start: %s" % '\n'.join(errors)) + raise errors.BootstrapError("Transaction couldn't start: %s" % '\n'.join(errs)) def run_pkg_script(self, pkg, prog, script, arg): mychroot = lambda: os.chroot(self.rootdir) -- 2.7.4