From: fujinhua <fu.jinhua@zte.com.cn>
Date: Mon, 4 Dec 2017 08:46:01 +0000 (+0800)
Subject: Fix pep8 error for vfc-nfvo-catalog
X-Git-Tag: v1.1.0~94
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a97f123e12ea027e1d62682fd27fc9808e9a3e93;p=vfc%2Fnfvo%2Fcatalog.git

Fix pep8 error for vfc-nfvo-catalog

Change-Id: I36a16047f5713ab364ab78c8076213ad536a10d7
Issue-ID: VFC-609
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
---

diff --git a/catalog/packages/nf_package.py b/catalog/packages/nf_package.py
index a6916e99..289a12e4 100644
--- a/catalog/packages/nf_package.py
+++ b/catalog/packages/nf_package.py
@@ -96,7 +96,8 @@ class NfDistributeThread(threading.Thread):
         except CatalogException as e:
             self.rollback_distribute()
             JobUtil.add_job_status(self.job_id, JOB_ERROR, e.message)
-        except:
+        except Exception as e:
+            logger.error(e.message)
             logger.error(traceback.format_exc())
             logger.error(str(sys.exc_info()))
             self.rollback_distribute()
@@ -149,7 +150,8 @@ class NfDistributeThread(threading.Thread):
         try:
             VnfPackageModel.objects.filter(vnfPackageId=self.csar_id).delete()
             fileutil.delete_dirs(self.csar_save_path)
-        except:
+        except Exception as e:
+            logger.error(e.message)
             logger.error(traceback.format_exc())
             logger.error(str(sys.exc_info()))
 
@@ -169,7 +171,8 @@ class NfPkgDeleteThread(threading.Thread):
             self.delete_csar()
         except CatalogException as e:
             JobUtil.add_job_status(self.job_id, JOB_ERROR, e.message)
-        except:
+        except Exception as e:
+            logger.error(e.message)
             logger.error(traceback.format_exc())
             logger.error(str(sys.exc_info()))
             JobUtil.add_job_status(self.job_id, JOB_ERROR, "Failed to delete CSAR(%s)" % self.csar_id)