From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 12 Aug 2013 21:09:51 +0000 (+0000)
Subject: Merge "remove Brick deps on cinder.exception"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9b3fa64f0796534fb0bf460ae2cf52fef036ff66;p=openstack-build%2Fcinder-build.git

Merge "remove Brick deps on cinder.exception"
---

9b3fa64f0796534fb0bf460ae2cf52fef036ff66
diff --cc cinder/brick/iscsi/iscsi.py
index de22bb9ce,5fb59b449..ec17e3181
--- a/cinder/brick/iscsi/iscsi.py
+++ b/cinder/brick/iscsi/iscsi.py
@@@ -426,10 -426,10 +426,10 @@@ class LioAdm(TargetAdmin)
                              name,
                              chap_auth_userid,
                              chap_auth_password]
 -            if extra_args != []:
 -                command_args += extra_args
 +            if extra_args:
 +                command_args.extend(extra_args)
              self._execute(*command_args, run_as_root=True)
-         except exception.ProcessExecutionError as e:
+         except putils.ProcessExecutionError as e:
                  LOG.error(_("Failed to create iscsi target for volume "
                              "id:%s.") % vol_id)
                  LOG.error("%s" % str(e))